Commit 13ec646f authored by garciay's avatar garciay
Browse files

Validation CAM/DENM with Commsignia IUT

parent 1a0c5428

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+3 −10
Original line number Diff line number Diff line
@@ -74,14 +74,13 @@ module LibItsDenm_TypesAndValues { 
            TransmissionInterval repetitionInterval optional,

            AlacarteContainer alacarte optional

        }

        

        /**

         * @desc Upper Tester result message of request of triggering of an event at IUT 

         */

        type record UtDenmTriggerResult {

            boolean result,

            ActionID actionId

        } with {

			encode (actionId) "LibItsDenm_asn1"

        }

        

        /**
@@ -99,8 +98,6 @@ module LibItsDenm_TypesAndValues { 
            TransmissionInterval transmissionInterval optional,

            TransmissionInterval repetitionInterval optional,

            AlacarteContainer alacarte optional

        } with {

			encode "LibItsDenm_asn1"

        }

        

        /**
@@ -109,8 +106,6 @@ module LibItsDenm_TypesAndValues { 
        type record UtDenmUpdateResult { 

            boolean result,

            ActionID actionId

        } with {

			encode (actionId) "LibItsDenm_asn1"

        }

        

        /**
@@ -118,8 +113,6 @@ module LibItsDenm_TypesAndValues { 
         */

        type record UtDenmTermination {

            ActionID actionId

        } with {

			encode (actionId) "LibItsDenm_asn1"

        }

        

        /**

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -1568,6 +1568,7 @@ module LibItsGeoNetworking_Functions { 
        

        /**

         * @desc Brings the IUT into an initial state.

         * @remark Component variable vc_hashedId8ToBeUsed shall be set with the IUT certificate to be used

         */

        function f_initialState() runs on ItsBaseGeoNetworking {

ttcn/Security/LibItsSecurity_Functions.ttcn3

+8 −2
Original line number Diff line number Diff line
@@ -528,6 +528,13 @@ module LibItsSecurity_Functions { 
        

        group deviceSignatureHelpers {

            

            /**

             * @desc Retrieve the HashedId8 to be sent to the IUT, based on the provided certificate identifier

             * @param p_certificateName The certificate the IUT shall use

             * @return The HashedId8 to be sent to the IUT in the UtInitialize command

             * @verdict Unchanged

             * @remark Component variable vc_hashedId8ToBeUsed shall be set with the IUT certificate to be used

             */

            function f_setupIutCertificate(

                                           in charstring p_certificateName

            ) runs on ItsSecurityBaseComponent return HashedId8 {
@@ -546,7 +553,6 @@ module LibItsSecurity_Functions { 
                }

                

                v_hashedId8 := f_calculateDigestFromCertificate(v_atCertificate);

                log("f_setupIutCertificate: v_hashedId8=", v_hashedId8);

                

                return v_hashedId8;

            } // End of function f_setupIutCertificate

ttcn/Security/LibItsSecurity_TestSystem.ttcn3

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ module LibItsSecurity_TestSystem { 
            var Certificate vc_aaCertificate;                       /** Test Adapter AT certificate */

            var Certificate vc_atCertificate;                       /** Test Adapter AT certificate */

            var Certificate vc_lastAtCertificateUsed;               /** Last Test Adapter certificate used in 'f_buildGnSecuredXXX' functions */

            var charstring vc_hashedId8ToBeUsed := "CERT_TS_A";     /** Digest value of the certificate couple to be used by the IUT. Default: CERT_IUT_A */

            var charstring vc_hashedId8ToBeUsed := "CERT_IUT_A";    /** Digest value of the certificate couple to be used by the IUT. Default: CERT_IUT_A */

            

            // Private keys

            var Oct32 vc_signingPrivateKey;

ttcn/DENM/LibItsDenm_Templates.ttcn

+3 −3

File changed.

Contains only whitespace changes.