move ITS AID constants to LibItsCommon

adapt DENM SSP TCs to use adapter security mode

ttcn/CAM/LibItsCam_Templates.ttcn

@@ -78,7 +78,7 @@ module LibItsCam_Templates {
         template CamInd mw_camIndWithSecurityParameters(
                                                           template (present) CAM p_camMsg,
                                                           template Bit128 p_ssp := *,
-                                                          template UInt32 p_its_aid := c_camItsAid
+                                                          template UInt32 p_its_aid := c_its_aid_CAM
         ) modifies mw_camInd := { 
             ssp             := p_ssp,
             its_aid         := p_its_aid

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

@@ -54,9 +54,7 @@ module LibItsCam_TypesAndValues {
         const DangerousGoodsBasic c_dangerousGoodsBasic_corrosiveSubstances := corrosiveSubstances;
         const DangerousGoodsBasic c_dangerousGoodsBasic_miscellaneousDangerousSubstances := miscellaneousDangerousSubstances;
         
-        const UInt32 c_camItsAid := 36;
-        
-        
+       
     } // end group camValues
 
     group utPrimitives {

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

@@ -194,6 +194,14 @@ module LibItsCommon_TypesAndValues {
         encode "AdapterControl"
     }
     
+    group securityConstants {
+		const integer c_its_aid_CAM   := 36; 
+		const integer c_its_aid_DENM  := 37; 
+		const integer c_its_aid_SPAT  := 137; 
+		const integer c_its_aid_MAP   := 138; 
+		const integer c_its_aid_IVI   := 139; 
+    	const integer c_its_aid_TLC   := 140;
+    }
 }
 with {
     encode "LibItsCommon"

ttcn/DENM/LibItsDenm_Templates.ttcn

@@ -103,7 +103,7 @@ module LibItsDenm_Templates {
         template DenmInd mw_denmIndWithSecurityParameters(
                                                           template (present) DENM p_denMsg,
                                                           template Bit128 p_ssp := *,
-                                                          template UInt32 p_its_aid := c_denmItsAid
+                                                          template UInt32 p_its_aid := c_its_aid_DENM
         ) modifies mw_denmInd := { 
             ssp             := p_ssp,
             its_aid         := p_its_aid

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

@@ -51,9 +51,7 @@ module LibItsDenm_TypesAndValues {
         const TransmissionInterval c_interval_4sec := 4000;
         const TransmissionInterval c_interval_5sec := 5000;
         const TransmissionInterval c_interval_10sec := 10000;
-        
-        const integer c_denmItsAid := 37;
-		const charstring c_certName_FullDENMSSP := "CERT_TS_A_AT";        
+       
     } // end group denmConstants
     
     group utPrimitives {

ttcn/Security/LibItsSecurity_Functions.ttcn3

@@ -13,6 +13,7 @@ module LibItsSecurity_Functions {
 
     // LibItsCommon
     import from LibItsCommon_Functions all;
+    import from LibItsCommon_TypesAndValues all;
     
     // LibItsSecurity
     import from LibItsSecurity_TypesAndValues all;

ttcn/Security/LibItsSecurity_Templates.ttcn3

@@ -34,18 +34,6 @@ module LibItsSecurity_Templates {
          */
         const UInt8 c_certificate_version := 2;
         
-        /**
-         * @desc Its AID for CAM
-         * @see Draft ETSI TS 103 097 V1.1.14 Clause 7.1 Security profile for CAMs
-         */
-        const IntX c_its_aid_CAM := 36;
-        
-        /**
-         * @desc Its AID for DENM
-         * @see Draft ETSI TS 103 097 V1.1.14 Clause 7.2 Security profile for DENMs
-         */
-        const IntX c_its_aid_DENM := 37;
-        
         /**
          * @desc Its AID for Other
          * @see Draft ETSI TS 103 097 V1.1.14 Clause 7.3 Security profile for DENMs