Commit a94f77e2 authored by filatov's avatar filatov
Browse files

move ITS AID constants to LibItsCommon 

adapt DENM SSP TCs to use adapter security mode
parent 3bc32831

ttcn/CAM/LibItsCam_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −3
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ module LibItsCam_TypesAndValues { 
        const DangerousGoodsBasic c_dangerousGoodsBasic_corrosiveSubstances := corrosiveSubstances;

        const DangerousGoodsBasic c_dangerousGoodsBasic_miscellaneousDangerousSubstances := miscellaneousDangerousSubstances;

        

        const UInt32 c_camItsAid := 36;

        

       

    } // end group camValues

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

+8 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −3
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ module LibItsDenm_TypesAndValues { 
        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 {