Add PX_CERT_FOR_TA to indicate which certificate the Test Adapter shall use (3bc32831) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Functions.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ module LibItsCam_Functions {
		* @desc Initialise secure mode if required
		*/
		function f_initialiseSecuredMode(
		in charstring p_certificateId := "CERT_TS_A_AT" // TODO To be refined
		in charstring p_certificateId := PX_CERT_FOR_TA
		) runs on ItsCam {

		if (PICS_IS_IUT_SECURED == true) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ module LibItsDenm_Functions {
		* @desc Initialise secure mode if required
		*/
		function f_initialiseSecuredMode(
		in charstring p_certificateId := "CERT_TS_A_AT" // TODO To be refined
		in charstring p_certificateId := PX_CERT_FOR_TA
		) runs on ItsDenm {

		if (PICS_IS_IUT_SECURED == true) {

+15 −14

Original line number	Diff line number	Diff line
		@@ -772,7 +772,7 @@ module LibItsGeoNetworking_Functions {
		* @desc Initialise secure mode if required
		*/
		function f_initialiseSecuredMode() runs on ItsBaseGeoNetworking {
		if (PICS_GN_SECURITY == true) {
		if ((PICS_GN_SECURITY == true) or (PICS_IS_IUT_SECURED == true)) {
		if(e_success != f_acEnableSecurity()){
		log("* INFO: TEST CASE NOW STOPPING ITSELF! *");
		stop;
		@@ -781,8 +781,7 @@ module LibItsGeoNetworking_Functions {
		} // End of function f_initialiseSecuredMode()

		function f_uninitialiseSecuredMode() runs on ItsBaseGeoNetworking {
		if (PICS_GN_SECURITY == true) {

		if ((PICS_GN_SECURITY == true) or (PICS_IS_IUT_SECURED == true)) {
		f_acDisableSecurity();
		}
		} // End of function f_initialiseSecuredMode()
		@@ -1775,6 +1774,7 @@ module LibItsGeoNetworking_Functions {
		// Local variables

		// Load certificates
		if (PICS_GN_SECURITY) {
		if( not f_loadCertificates(PX_IUT_SEC_CONFIG_NAME) ) {
		return e_error;
		}
		@@ -1784,9 +1784,10 @@ module LibItsGeoNetworking_Functions {
		f_getTsLatitude(),
		f_getTsLongitude()
		);

		return f_acTriggerSecEvent(m_acEnableSecurity(cc_taCert_A));
		}
		return f_acTriggerSecEvent(m_acEnableSecurity(PX_CERT_FOR_TA));
		}

		/**
		* @desc Triggers test adapter to disable security support

+10 −6

Original line number	Diff line number	Diff line
		@@ -65,8 +65,10 @@ module LibItsGeoNetworking_Pics {
		modulepar integer PICS_GN_LIFETIME_LOC_TE := 20;

		/**
		* @desc GN Security enabled or disabled
		* @desc GN Security support enabled or disabled
		* @see ETSI TS 102 871-2 Table 4
		* @remark This PIC is different than PICS_IS_IUT_SECURED.
		* When set to true, this PIC indicates that the GeoNetworking is running with security against a secured device
		*/
		modulepar boolean PICS_GN_SECURITY := true;

		@@ -351,11 +353,13 @@ module LibItsGeoNetworking_Pics {
		*/
		modulepar MacAddress PICS_IUT_MAC_ADDRESS := 'FFFFFFFFFFFF'O;

		} // end geoNwPics

		/**
		* @desc Is the IUT running in secured mode?
		* @remark This PIC is different than PICS_GN_SECURITY.
		* When set to true, this PIC indicates that the GeoNetworking is running without security against a secured device
		*/
		modulepar boolean PICS_IS_IUT_SECURED := false;

		} // end geoNwPics

		} // end LibItsGeoNetworking_Pics
		No newline at end of file

+6 −0

Original line number	Diff line number	Diff line
		@@ -200,4 +200,10 @@ module LibItsGeoNetworking_Pixits {

		} // end geoNetworkingPixits

		/**
		* @desc The certificate identifier the TA shall use in case of secured IUT. Default: CERT_IUT_A_AT
		* @remark If the IUT cannot use the test certificates, set this PIXIT to CERT_NONE
		*/
		modulepar charstring PX_CERT_FOR_TA := "CERT_TS_A_AT";

		} // end LibItsGeoNetworking_Pixits