Skip to content
GitLab
Commit dd9890b9 authored by garciay's avatar garciay
Browse files

Implement last TODO in CAM test cases

parent e3978429
Hide whitespace changes
Inline Side-by-side
ttcn/Common/LibItsCommon_Functions.ttcn
View file @ dd9890b9
......@@ -93,7 +93,7 @@ module LibItsCommon_Functions {
function f_getCurrentTime() return TimestampIts {
var TimestampIts v_timeStamp := 0;
log("*** f_getCurrentTime: INFO: calling fx_getCurrentTime() ***");
// log("*** f_getCurrentTime: INFO: calling fx_getCurrentTime() ***");
v_timeStamp := fx_getCurrentTime();
return v_timeStamp;
......
ttcn/Security/LibItsSecurity_Functions.ttcn3
View file @ dd9890b9
......@@ -195,7 +195,7 @@ module LibItsSecurity_Functions {
in template (omit) HeaderFields p_headerFields := omit,
in UInt8 p_securityProfile :=0
) runs on ItsSecurityBaseComponent return boolean {
// Local variables
var octetstring v_secPayload, v_signature;
var Oct32 v_hash;
var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
......@@ -204,7 +204,7 @@ module LibItsSecurity_Functions {
var SecPayloads v_toBeSignedPayloads := {};
// Prepare headers
if(not(ispresent(valueof(p_headerFields)))) {
if(not(ispresent(p_headerFields))) {
v_headerFields := p_mandatoryHeaders;
}
else {
......@@ -317,13 +317,12 @@ module LibItsSecurity_Functions {
in template (omit) charstring p_certificateName := omit,
in boolean p_addMissingHeaders := true
) runs on ItsSecurityBaseComponent return boolean {
// Local variables
var Certificate v_aaCertificate, v_atCertificate;
var HeaderFields v_mandatoryHeaders := {};
var HeaderField v_signerInfo;
// Sanity check
// Load certificates if required
if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {
if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {
return false;
......@@ -385,13 +384,12 @@ module LibItsSecurity_Functions {
in template (omit) charstring p_certificateName := omit,
in boolean p_addMissingHeaders := true
) runs on ItsSecurityBaseComponent return boolean {
// Local variables
var Certificate v_aaCertificate, v_atCertificate;
var HeaderFields v_mandatoryHeaders := {};
var HeaderField v_signerInfo;
// Sanity check
// Load certificates if required
if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {
if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {
return false;
......@@ -404,6 +402,7 @@ module LibItsSecurity_Functions {
v_atCertificate := vc_atCertificate;
}
// Add additional headers if required
if(p_addMissingHeaders == true) {
// Prepare mandatory headers
if (valueof(p_signerInfoType) == e_certificate) { // Add the AT certificate
......@@ -430,6 +429,7 @@ module LibItsSecurity_Functions {
}
}
// Build the secured message and return it
return f_buildGnSecuredMessage(p_securedMessage, p_payloadFields, v_mandatoryHeaders, p_headerFields, c_security_profileDENMs);
} // end f_buildGnSecuredDenm
......@@ -460,7 +460,7 @@ module LibItsSecurity_Functions {
var HeaderFields v_mandatoryHeaders := {};
var HeaderField v_signerInfo;
// Sanity check
// Load certificates if required
if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {
if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {
return false;
......@@ -473,6 +473,7 @@ module LibItsSecurity_Functions {
v_atCertificate := vc_atCertificate;
}
// Add additional headers if required
if(p_addMissingHeaders == true) {
// Prepare mandatory headers
if (valueof(p_signerInfoType) == e_certificate) { // Add the AT certificate
......@@ -498,9 +499,9 @@ module LibItsSecurity_Functions {
}
}
// Build the secured message and return it
return f_buildGnSecuredMessage(p_securedMessage, p_payloadFields, v_mandatoryHeaders, p_headerFields, c_security_profileOthers);
} // end f_buildGnSecuredOtherMessage
} // End of function f_buildGnSecuredOtherMessage
} // End of group hostSignatureHelpers
......@@ -517,7 +518,6 @@ module LibItsSecurity_Functions {
in template (value) Certificate p_certificateToBeVerified,
in template (value) PublicKey p_publicKey
) return boolean {
// Local variables
var octetstring toBeVerifiedData;
var octetstring v_signature;
......
ttcn/Security/LibItsSecurity_Templates.ttcn3
View file @ dd9890b9
......@@ -1206,43 +1206,42 @@ module LibItsSecurity_Templates {
* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
*/
template (present) HeaderField mw_header_field_signer_info_certificate (
template (present) Certificate p_cert := ?
in template (present) Certificate p_cert := ?
) := {
type_ := e_signer_info,
headerField := {
signer := mw_signerInfo_certificate(p_cert)
}
} // End of template mw_header_field_signer_info_certificate
/**
* @desc Receive template for HeaderField with signer information
* containing certificate digest
* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
*/
template (present) HeaderField mw_header_field_signer_info_digest (
template (present) HashedId8 p_digest := ?
in template (present) HashedId8 p_digest := ?
) := {
type_ := e_signer_info,
headerField := {
signer := mw_signerInfo_digest(p_digest)
}
} // End of template mw_header_field_signer_info_digest
/**
* @desc Receive template for HeaderField with signer information
* containing certificate chain
* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
*/
template (present) HeaderField mw_header_field_signer_info_certificate_chain (
template (present) CertificateChain p_certs := ?
in template (present) CertificateChain p_certs := ?
) := {
type_ := e_signer_info,
headerField := {
signer := mw_signerInfo_certificates(p_certs)
}
} // End of template mw_header_field_signer_info_certificate_chain
/**
* @desc Receive template for HeaderField with signer information
* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
......@@ -1274,7 +1273,7 @@ module LibItsSecurity_Templates {
* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
*/
template (present) HeaderField mw_header_field_message_type(
in template (present) UInt16 p_message_type
in template (present) UInt16 p_message_type
) := {
type_ := e_message_type,
headerField := {
......@@ -1286,8 +1285,8 @@ module LibItsSecurity_Templates {
* @desc Receive template for HeaderField with request for unrecognized certificate
* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
*/
template (present) HeaderField mw_header_field_request_unrecognized_certificate (
template (present) HashedId3s p_digests := ?
template (present) HeaderField mw_header_field_request_unrecognized_certificate(
in template (present) HashedId3s p_digests := ?
) := {
type_ := e_request_unrecognized_certificate,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment