Implement last TODO in CAM test cases (dd9890b9) · Commits · TTCN-3 Libraries / LibIts

ttcn/Common/LibItsCommon_Functions.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@ module LibItsCommon_Functions {
	function f_getCurrentTime() return TimestampIts {		function f_getCurrentTime() return TimestampIts {
	var TimestampIts v_timeStamp := 0;		var TimestampIts v_timeStamp := 0;

	log("* f_getCurrentTime: INFO: calling fx_getCurrentTime() *");		// log("* f_getCurrentTime: INFO: calling fx_getCurrentTime() *");
	v_timeStamp := fx_getCurrentTime();		v_timeStamp := fx_getCurrentTime();

	return v_timeStamp;		return v_timeStamp;

ttcn/Security/LibItsSecurity_Functions.ttcn3

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -195,7 +195,7 @@ module LibItsSecurity_Functions {
	in template (omit) HeaderFields p_headerFields := omit,		in template (omit) HeaderFields p_headerFields := omit,
	in UInt8 p_securityProfile :=0		in UInt8 p_securityProfile :=0
	) runs on ItsSecurityBaseComponent return boolean {		) runs on ItsSecurityBaseComponent return boolean {
			// Local variables
	var octetstring v_secPayload, v_signature;		var octetstring v_secPayload, v_signature;
	var Oct32 v_hash;		var Oct32 v_hash;
	var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;		var template (value) ToBeSignedSecuredMessage v_toBeSignedSecuredMessage;
	@@ -204,7 +204,7 @@ module LibItsSecurity_Functions {
	var SecPayloads v_toBeSignedPayloads := {};		var SecPayloads v_toBeSignedPayloads := {};

	// Prepare headers		// Prepare headers
	if(not(ispresent(valueof(p_headerFields)))) {		if(not(ispresent(p_headerFields))) {
	v_headerFields := p_mandatoryHeaders;		v_headerFields := p_mandatoryHeaders;
	}		}
	else {		else {
	@@ -317,13 +317,12 @@ module LibItsSecurity_Functions {
	in template (omit) charstring p_certificateName := omit,		in template (omit) charstring p_certificateName := omit,
	in boolean p_addMissingHeaders := true		in boolean p_addMissingHeaders := true
	) runs on ItsSecurityBaseComponent return boolean {		) runs on ItsSecurityBaseComponent return boolean {

	// Local variables		// Local variables
	var Certificate v_aaCertificate, v_atCertificate;		var Certificate v_aaCertificate, v_atCertificate;
	var HeaderFields v_mandatoryHeaders := {};		var HeaderFields v_mandatoryHeaders := {};
	var HeaderField v_signerInfo;		var HeaderField v_signerInfo;

	// Sanity check		// Load certificates if required
	if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {		if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {
	if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {		if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {
	return false;		return false;
	@@ -385,13 +384,12 @@ module LibItsSecurity_Functions {
	in template (omit) charstring p_certificateName := omit,		in template (omit) charstring p_certificateName := omit,
	in boolean p_addMissingHeaders := true		in boolean p_addMissingHeaders := true
	) runs on ItsSecurityBaseComponent return boolean {		) runs on ItsSecurityBaseComponent return boolean {

	// Local variables		// Local variables
	var Certificate v_aaCertificate, v_atCertificate;		var Certificate v_aaCertificate, v_atCertificate;
	var HeaderFields v_mandatoryHeaders := {};		var HeaderFields v_mandatoryHeaders := {};
	var HeaderField v_signerInfo;		var HeaderField v_signerInfo;

	// Sanity check		// Load certificates if required
	if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {		if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {
	if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {		if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {
	return false;		return false;
	@@ -404,6 +402,7 @@ module LibItsSecurity_Functions {
	v_atCertificate := vc_atCertificate;		v_atCertificate := vc_atCertificate;
	}		}

			// Add additional headers if required
	if(p_addMissingHeaders == true) {		if(p_addMissingHeaders == true) {
	// Prepare mandatory headers		// Prepare mandatory headers
	if (valueof(p_signerInfoType) == e_certificate) { // Add the AT certificate		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);		return f_buildGnSecuredMessage(p_securedMessage, p_payloadFields, v_mandatoryHeaders, p_headerFields, c_security_profileDENMs);

	} // end f_buildGnSecuredDenm		} // end f_buildGnSecuredDenm
	@@ -460,7 +460,7 @@ module LibItsSecurity_Functions {
	var HeaderFields v_mandatoryHeaders := {};		var HeaderFields v_mandatoryHeaders := {};
	var HeaderField v_signerInfo;		var HeaderField v_signerInfo;

	// Sanity check		// Load certificates if required
	if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {		if (ispresent(p_certificateName) and (valueof(p_certificateName) != cc_taCertA)) {
	if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {		if (f_readCertificate(valueof(p_certificateName) & ".AA_CERT", v_aaCertificate) == false) {
	return false;		return false;
	@@ -473,6 +473,7 @@ module LibItsSecurity_Functions {
	v_atCertificate := vc_atCertificate;		v_atCertificate := vc_atCertificate;
	}		}

			// Add additional headers if required
	if(p_addMissingHeaders == true) {		if(p_addMissingHeaders == true) {
	// Prepare mandatory headers		// Prepare mandatory headers
	if (valueof(p_signerInfoType) == e_certificate) { // Add the AT certificate		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);		return f_buildGnSecuredMessage(p_securedMessage, p_payloadFields, v_mandatoryHeaders, p_headerFields, c_security_profileOthers);
			} // End of function f_buildGnSecuredOtherMessage
	} // end f_buildGnSecuredOtherMessage

	} // End of group hostSignatureHelpers		} // End of group hostSignatureHelpers

	@@ -517,7 +518,6 @@ module LibItsSecurity_Functions {
	in template (value) Certificate p_certificateToBeVerified,		in template (value) Certificate p_certificateToBeVerified,
	in template (value) PublicKey p_publicKey		in template (value) PublicKey p_publicKey
	) return boolean {		) return boolean {

	// Local variables		// Local variables
	var octetstring toBeVerifiedData;		var octetstring toBeVerifiedData;
	var octetstring v_signature;		var octetstring v_signature;

ttcn/Security/LibItsSecurity_Templates.ttcn3

+9 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1206,7 +1206,7 @@ module LibItsSecurity_Templates {
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField		* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
	*/		*/
	template (present) HeaderField mw_header_field_signer_info_certificate (		template (present) HeaderField mw_header_field_signer_info_certificate (
	template (present) Certificate p_cert := ?		in template (present) Certificate p_cert := ?
	) := {		) := {
	type_ := e_signer_info,		type_ := e_signer_info,
	headerField := {		headerField := {
	@@ -1220,7 +1220,7 @@ module LibItsSecurity_Templates {
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField		* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
	*/		*/
	template (present) HeaderField mw_header_field_signer_info_digest (		template (present) HeaderField mw_header_field_signer_info_digest (
	template (present) HashedId8 p_digest := ?		in template (present) HashedId8 p_digest := ?
	) := {		) := {
	type_ := e_signer_info,		type_ := e_signer_info,
	headerField := {		headerField := {
	@@ -1234,7 +1234,7 @@ module LibItsSecurity_Templates {
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField		* @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) HeaderField mw_header_field_signer_info_certificate_chain (
	template (present) CertificateChain p_certs := ?		in template (present) CertificateChain p_certs := ?
	) := {		) := {
	type_ := e_signer_info,		type_ := e_signer_info,
	headerField := {		headerField := {
	@@ -1242,7 +1242,6 @@ module LibItsSecurity_Templates {
	}		}
	} // End of template mw_header_field_signer_info_certificate_chain		} // End of template mw_header_field_signer_info_certificate_chain


	/**		/**
	* @desc Receive template for HeaderField with signer information		* @desc Receive template for HeaderField with signer information
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField		* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
	@@ -1287,7 +1286,7 @@ module LibItsSecurity_Templates {
	* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField		* @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4 HeaderField
	*/		*/
	template (present) HeaderField mw_header_field_request_unrecognized_certificate(		template (present) HeaderField mw_header_field_request_unrecognized_certificate(
	template (present) HashedId3s p_digests := ?		in template (present) HashedId3s p_digests := ?

	) := {		) := {
	type_ := e_request_unrecognized_certificate,		type_ := e_request_unrecognized_certificate,

Admin message