Commit 5b444a48 authored by berge's avatar berge
Browse files

Merged revision(s) 1061-1087 from trunk

parent 97c6be61
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ module LibItsCam_Templates {
             * @desc Initializes the CAM IUT. 
             */
            template (value) UtInitialize m_camInitialize := {
                hashedId8 := '0000000000000000'O
            }
            
            /**
+7 −2
Original line number Diff line number Diff line
@@ -7,15 +7,20 @@
 */
module LibItsCommon_TypesAndValues {
    
    // LibCommon
    import from LibCommon_DataStrings all;
    
    // LibIts
    import from ITS_Container language "ASN.1:1997" all;

    group utPrimitives {
        
        /**
         * @desc Upper Tester message to initialize DENM IUT 
         * @desc Upper Tester message to initialize IUT 
         * @member hashedId8 In case of secured mode set, hashedId8 indicate which certificate the IUT shall use
         */
        type record UtInitialize {
            // empty on purpose
            Oct8 hashedId8 
        }
        
        /**
+40 −39
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ module LibItsDenm_Templates {
             * @desc    Send template for Upper Tester event initialization
             */
            template (value) UtInitialize m_denmInitialize := {
                hashedId8 := '0000000000000000'O
            }
            
            /**
+8 −1
Original line number Diff line number Diff line
@@ -1571,6 +1571,13 @@ module LibItsGeoNetworking_Functions {
         */
        function f_initialState() runs on ItsBaseGeoNetworking {
            
            if (PICS_GN_SECURITY) {
                var Oct8 v_hashedId8ToBeUsed := f_setupIutCertificate(vc_hashedId8ToBeUsed);
                if (oct2int(v_hashedId8ToBeUsed) != 0) {
                    f_utInitializeIut(m_secGnInitialize(v_hashedId8ToBeUsed));
                    return;
                }
            } // else, default behavior
            f_utInitializeIut(m_gnInitialize);
        }
        
+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ module LibItsGeoNetworking_Templates {
             * @desc Initializes the GN IUT.
             */
            template (value) UtInitialize m_gnInitialize := {
                hashedId8 := '0000000000000000'O
            }
            
            /**
Loading