Enhance security support during configuration set up (4a5168b1) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+1 −10

Original line number	Diff line number	Diff line
		@@ -754,8 +754,6 @@ module LibItsGeoNetworking_Functions {
		function f_initialiseSecuredMode() runs on ItsBaseGeoNetworking {
		if (PICS_SECURED_MODE == true) {
		f_acEnableSecurity();
		} else { // Override Test Adapter sercured mode settings
		f_acDisableSecurity();
		}
		} // End of function f_initialiseSecuredMode()

		@@ -1746,14 +1744,7 @@ module LibItsGeoNetworking_Functions {

		return f_acTriggerEvent(
		AcGnPrimitive:{ acEnableSecurity := m_enableSecurity(
		vc_signingPrivateKey,
		vc_atCertificate.subject_attributes[0].attribute.key.public_key.eccPoint.x,
		vc_atCertificate.subject_attributes[0].attribute.key.public_key.eccPoint.y.y,
		vc_encryptPrivateKey,
		vc_atCertificate.subject_attributes[1].attribute.key.public_key.aesCcm.eccPoint.x,
		vc_atCertificate.subject_attributes[1].attribute.key.public_key.aesCcm.eccPoint.y.y,
		bit2oct(encvalue(v_toBeSignedSecuredMessageDigest)),
		bit2oct(encvalue(v_toBeSignedSecuredMessageCertificate))
		"TA_CERT_A"
		) }
		);
		}

+2 −16

Original line number	Diff line number	Diff line
		@@ -2284,23 +2284,9 @@ module LibItsSecurity_Templates {
		* @desc Enable security support
		*/
		template (value) AcEnableSecurity m_enableSecurity(
		in Oct32 p_signingPrivateKey,
		in Oct32 p_signingPublicKeyX,
		in Oct32 p_signingPublicKeyY,
		in Oct32 p_encryptPrivateKey,
		in Oct32 p_encryptPublicKeyX,
		in Oct32 p_encryptPublicKeyY,
		in octetstring p_toBeSignedSecuredMessageTemplateDigest,
		in octetstring p_toBeSignedSecuredMessageTemplateCertificate
		) := {
		signingPrivateKey := p_signingPrivateKey,
		signingPublicKeyX := p_signingPublicKeyX,
		signingPublicKeyY := p_signingPublicKeyY,
		encryptPrivateKey := p_encryptPrivateKey,
		encryptPublicKeyX := p_encryptPublicKeyX,
		encryptPublicKeyY := p_encryptPublicKeyY,
		toBeSignedSecuredMessageTemplateDigest := p_toBeSignedSecuredMessageTemplateDigest,
		toBeSignedSecuredMessageTemplateCertificate := p_toBeSignedSecuredMessageTemplateCertificate
		in charstring p_certificateId
		) := {
		certificateId := p_certificateId
		} // End of template m_enableSecurity

		/**

+2 −8

Original line number	Diff line number	Diff line
		@@ -938,16 +938,10 @@ module LibItsSecurity_TypesAndValues {

		/**
		* @desc Primitive used to activate security support
		* @member certificateId The certificate identifier to be used
		*/
		type record AcEnableSecurity {
		Oct32 signingPrivateKey,
		Oct32 signingPublicKeyX,
		Oct32 signingPublicKeyY,
		Oct32 encryptPrivateKey,
		Oct32 encryptPublicKeyX,
		Oct32 encryptPublicKeyY,
		octetstring toBeSignedSecuredMessageTemplateDigest,
		octetstring toBeSignedSecuredMessageTemplateCertificate
		charstring certificateId
		} // End of type AcEnableSecurity

		/**