Commit 07b4436b authored by garciay's avatar garciay
Browse files

Re-organise import section 

Update TA security message
parent 615cbba5

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+26 −11
Original line number Original line Diff line number Diff line
@@ -11,16 +11,25 @@ module LibItsGeoNetworking_Templates { 
    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    import from LibCommon_DataStrings all;

    

    

    // LibIts

    // LibItsCommon

    import from LibItsCommon_TypesAndValues all;

    import from LibItsCommon_TypesAndValues all;

    import from LibItsExternal_TypesAndValues all;

    

    // LibItsBtp

    import from LibItsBtp_Templates all;

    

    // LibItsSecurity

    import from LibItsSecurity_TypesAndValues all;

    import from LibItsSecurity_Pixits all;

    

    // LibItsIpv6OverGeoNetworking

    import from LibItsIpv6OverGeoNetworking_TypesAndValues all;

    import from LibItsIpv6OverGeoNetworking_Templates all;

    

    // AtsGeoNetworking

    import from LibItsGeoNetworking_TestSystem all;

    import from LibItsGeoNetworking_TestSystem all;

    import from LibItsGeoNetworking_TypesAndValues all;

    import from LibItsGeoNetworking_TypesAndValues all;

    import from LibItsGeoNetworking_Pixits all;

    import from LibItsGeoNetworking_Pixits all;

    import from LibItsIpv6OverGeoNetworking_TypesAndValues all;

    import from LibItsIpv6OverGeoNetworking_Templates all;

    import from LibItsBtp_Templates all;

    import from LibItsExternal_TypesAndValues all;

    import from LibItsSecurity_TypesAndValues all;

    

    

    group geoNwPrimitivesTemplates {

    group geoNwPrimitivesTemplates {
@@ -419,7 +428,13 @@ module LibItsGeoNetworking_Templates { 
             */

             */

            template AcGnPrimitive m_enableSecurity := {

            template AcGnPrimitive m_enableSecurity := {

                acEnableSecurity := {

                acEnableSecurity := {

                    enable := true

                    enable := true,

                    signingPrivateKey := PX_PRIVATE_SIGNING_KEYS[PX_CERTIFICATE_CONFIG_IDX],

                    signingPublicKeyX := PX_AT_CERTIFICATES[PX_CERTIFICATE_CONFIG_IDX].subject_attributes[0].attribute.key.public_key.eccPoint.x,

                    signingPublicKeyY := PX_AT_CERTIFICATES[PX_CERTIFICATE_CONFIG_IDX].subject_attributes[0].attribute.key.public_key.eccPoint.y.y,

                    encryptPrivateKey := omit,

                    encryptPublicKeyX := omit,

                    encryptPublicKeyY := omit

                }

                }

            }

            }