Commit afb30ae0 authored by YannGarcia's avatar YannGarcia
Browse files

Enhance AtsRSUsSimulator

parent 93706865

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -1655,7 +1655,7 @@ module LibItsGeoNetworking_Templates { 
            /**

            /**

             * @desc    Default send template for traffic class

             * @desc    Default send template for traffic class

             */

             */

            template (value) TrafficClass m_trafficClass ( in SCF p_scf := e_scfEnable, in ChannelOffload p_ChOff := e_choffDisabled ) := {

            template (value) TrafficClass m_trafficClass ( in SCF p_scf := e_scfEnabled, in ChannelOffload p_ChOff := e_choffDisabled ) := {

                scf             := p_scf,

                scf             := p_scf,

                channelOffload  := p_ChOff,

                channelOffload  := p_ChOff,

                tcId            := 0

                tcId            := 0

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -346,7 +346,7 @@ module LibItsGeoNetworking_TypesAndValues { 
            

            

      type enumerated SCF {

      type enumerated SCF {

        e_scfDisabled(0),

        e_scfDisabled(0),

        e_scfEnable (1)

        e_scfEnabled (1)

        } with {

        } with {

        variant "FIELDLENGTH(1)" //variant "1 bit"

        variant "FIELDLENGTH(1)" //variant "1 bit"

        }

        }

ttcn/Security/LibItsSecurity_Functions.ttcn

+2 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ module LibItsSecurity_Functions { 
    // LibItsCommon

    // LibItsCommon

    //import from LibItsCommon_Functions all;

    //import from LibItsCommon_Functions all;

    //import from LibItsCommon_TypesAndValues all;

    //import from LibItsCommon_TypesAndValues all;

    import from LibItsCommon_Pixits all;

    

    

    // LibItsSecurity

    // LibItsSecurity

    import from LibItsSecurity_TypesAndValues all;

    import from LibItsSecurity_TypesAndValues all;
@@ -2177,7 +2178,7 @@ module LibItsSecurity_Functions { 
                // Setup certificates memory cache

                // Setup certificates memory cache

                if (fx_loadCertificates(PX_CERTIFICATE_POOL_PATH, p_configId) == true) {

                if (fx_loadCertificates(PX_CERTIFICATE_POOL_PATH, p_configId) == true) {

                  // Setup security component variables

                  // Setup security component variables

                  if (f_readCertificate(cc_taCert_A, vc_atCertificate) == true) {

                  if (f_readCertificate(PX_CERT_FOR_TS, vc_atCertificate) == true) {

                    var HashedId8 v_issuer;

                    var HashedId8 v_issuer;

                    log("Issuer: ", vc_atCertificate.issuer);

                    log("Issuer: ", vc_atCertificate.issuer);

                    if (ischosen(vc_atCertificate.issuer.sha256AndDigest)) {

                    if (ischosen(vc_atCertificate.issuer.sha256AndDigest)) {

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn

+4 −1
Original line number Original line Diff line number Diff line
@@ -15,13 +15,16 @@ module LibItsSecurity_TypesAndValues { 
    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    import from LibCommon_DataStrings all;





    // LibItsCommon

    import from LibItsCommon_Pixits all;

    

    // LibIts

    // LibIts

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

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

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

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

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

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

    

    

        // Test Adapter certificates & private keys - Valid behavior

        // Test Adapter certificates & private keys - Valid behavior

        const charstring cc_taCert_A  := "CERT_TS_A_AT";   /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */

        const charstring cc_taCert_A  := PX_CERT_FOR_TS;   /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */

        const charstring cc_taCert_A_AA := "CERT_TS_A_AA";

        const charstring cc_taCert_A_AA := "CERT_TS_A_AA";

        const charstring cc_taCert_A_EA := "CERT_TS_A_EA";

        const charstring cc_taCert_A_EA := "CERT_TS_A_EA";

        const charstring cc_taCert_A1 := "CERT_TS_A_A1_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */

        const charstring cc_taCert_A1 := "CERT_TS_A_A1_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+11 −11

File changed.

Contains only whitespace changes.