Commit c90e6abd authored by YannGarcia's avatar YannGarcia
Browse files

Build AtsSecurity Release.2

parent c6b58922

ItsSecurity_Functions.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ module ItsSecurity_Functions { 
    import from Ieee1609Dot2BaseTypes language "ASN.1:1997" all;

    import from Ieee1609Dot2 language "ASN.1:1997" all;

    import from EtsiTs103097Module language "ASN.1:1997" all;

    import from ITS_Container language "ASN.1:1997" all;

    import from ETSI_ITS_CDD language "ASN.1:1997" all;

    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

    

    // LibItsCommon
@@ -860,8 +860,8 @@ module ItsSecurity_Functions { 
            vc_default := activate(LibItsDenm_Functions.a_utDefault());



            log("fb_secTriggerDenmEvent: Call LibItsDenm_Functions.f_utTriggerEvent with ", m_utTriggerEvent(v_situation, defaultValidity));

            vc_utActionIDs[0] := LibItsDenm_Functions.f_utTriggerEvent(m_utTriggerEvent(v_situation, defaultValidity));

            log("fb_secTriggerDenmEvent: actionId=", vc_utActionIDs[0]);

            vc_utActionIds[0] := LibItsDenm_Functions.f_utTriggerEvent(m_utTriggerEvent(v_situation, defaultValidity));

            log("fb_secTriggerDenmEvent: actionId=", vc_utActionIds[0]);

            

        }  // End of function f_secTriggerDenmEvent
@@ -873,8 +873,8 @@ module ItsSecurity_Functions { 
            // Local variables

            var integer v_counter;

            

            for (v_counter := 0; v_counter < lengthof(vc_utActionIDs); v_counter := v_counter + 1) {

                LibItsDenm_Functions.f_utTerminateEvent(m_utEventCancellation(vc_utActionIDs[v_counter]));

            for (v_counter := 0; v_counter < lengthof(vc_utActionIds); v_counter := v_counter + 1) {

                LibItsDenm_Functions.f_utTerminateEvent(m_utEventCancellation(vc_utActionIds[v_counter]));

            } // End of 'for' statement

            

            unmap(self:utPort, system:denmUtPort);

ItsSecurity_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module ItsSecurity_Templates { 
    

//    // LibIts

//    import from DENM_PDU_Descriptions language "ASN.1:1997" all;

//    import from ITS_Container language "ASN.1:1997" all;

//    import from ETSI_ITS_CDD language "ASN.1:1997" all;

//    

    // LibItsBtp

    /* import from LibItsBtp_TypesAndValues all; */

lib/LibItsSecurity_Templates.ttcn

+12 −12
Original line number Diff line number Diff line
@@ -762,19 +762,19 @@ module LibItsSecurity_Templates { 
            eciesBrainpoolP256r1 := p_eciesBrainpoolP256r1

        } // End of template mw_encryptedDataEncryptionKey_eciesBrainpoolP256r1

        

        template (value) SymmetricCiphertext m_SymmetricCiphertext_aes128ccm(

                                                                             in template (value) AesCcmCiphertext p_aes128ccm

        template (value) SymmetricCiphertext m_symmetricCiphertext_aes128ccm(

                                                                             in template (value) One28BitCcmCiphertext p_aes128ccm

        ) := {

            aes128ccm := p_aes128ccm

        } // End of template m_SymmetricCiphertext_aes128ccm

        } // End of template m_symmetricCiphertext_aes128ccm

        

        template (present) SymmetricCiphertext mw_SymmetricCiphertext_aes128ccm(

                                                                                template (present) AesCcmCiphertext p_aes128ccm := ?

        template (present) SymmetricCiphertext mw_symmetricCiphertext_aes128ccm(

                                                                                template (present) One28BitCcmCiphertext p_aes128ccm := ?

        ) := {

            aes128ccm := p_aes128ccm

        } // End of template mw_SymmetricCiphertext_aes128ccm

        } // End of template mw_symmetricCiphertext_aes128ccm



        template (value) AesCcmCiphertext m_aesCcmCiphertext(

        template (value) One28BitCcmCiphertext m_aesCcmCiphertext(

                                                                  in template (value) Oct12 p_nonce,

                                                                  in template (value) Opaque p_ccmCiphertext

        ) := {
@@ -782,7 +782,7 @@ module LibItsSecurity_Templates { 
            ccmCiphertext := p_ccmCiphertext

        } // End of template m_aesCcmCiphertext

        

        template (present) AesCcmCiphertext mw_aesCcmCiphertext(

        template (present) One28BitCcmCiphertext mw_aesCcmCiphertext(

                                                                     template (present) Oct12 p_nonce := ?,

                                                                     template (present) Opaque p_ccmCiphertext := ?

        ) := {

asn1 @ e3d92dfb

Compare a822c4b6 to e3d92dfb
Original line number Diff line number Diff line 
Subproject commit a822c4b6fa2b3640f14f45066d233b5017d86db2
 
Subproject commit e3d92dfb93b4609b2f978d22ea56ba678b6b04d3