Commit 5eeb619d authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve conflict from merge

parents c14b2e57 e7bd6454

ttcn/Pki/LibItsPki_Functions.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -3111,7 +3111,7 @@ module LibItsPki_Functions { 




      log(">>> f_sign_dc_ctl");

      log(">>> f_sign_dc_ctl");





      f_readSigningKey(p_issuer_certificate_id, v_private_key)

      f_readSigningKey(p_issuer_certificate_id, v_private_key);

      f_getCertificateHash(p_issuer_certificate_id, v_issuer);

      f_getCertificateHash(p_issuer_certificate_id, v_issuer);





      // Encode the main data structure

      // Encode the main data structure

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn

+36 −33
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ module LibItsSecurity_TypesAndValues { 
     * @desc Sequence of HashedId8

     * @desc Sequence of HashedId8

     */

     */

    type record of HashedId8 HashedId8s;

    type record of HashedId8 HashedId8s;



        // Test Adapter certificates & private keys - Valid behavior

        // Test Adapter certificates & private keys - Valid behavior

        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  := 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";
@@ -142,15 +141,24 @@ module LibItsSecurity_TypesAndValues { 
        const charstring cc_taCert1901_BO := "CERT_TS_19_01_BO_AT"; /** Check that IUT discards a SecuredMessage if the reserved region type has been used in region validity restriction of the AT certificate */

        const charstring cc_taCert1901_BO := "CERT_TS_19_01_BO_AT"; /** Check that IUT discards a SecuredMessage if the reserved region type has been used in region validity restriction of the AT certificate */

        

        

        // IUT certificates & private keys

        // IUT certificates & private keys

        const charstring cc_taCert_CA2   := "CERT_IUT_CA2_AT";

        const charstring cc_iutCert_C1    := "CERT_IUT_C1_AT";

        const charstring cc_taCert_CA3   := "CERT_IUT_CA3_AT";

        const charstring cc_iutCert_CA1   := "CERT_IUT_CA1_AT";

        const charstring cc_taCert_CC_AA := "CERT_IUT_CC_AA";

        const charstring cc_iutCert_CA2   := "CERT_IUT_CA2_AT";

        const charstring cc_iutCert_C3   := "CERT_IUT_C3_AA";

        const charstring cc_iutCert_CA3   := "CERT_IUT_CA3_AT";

        const charstring cc_iutCert_CA_AA := "CERT_IUT_CA_AA";

        const charstring cc_iutCert_CC_AA := "CERT_IUT_CC_AA";

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

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

        const charstring cc_iutCert_A1     := "CERT_IUT_A1_AT"; 

        const charstring cc_iutCert_A2     := "CERT_IUT_A2_AT"; 

        const charstring cc_iutCert_A3     := "CERT_IUT_A3_AT"; 

        const charstring cc_iutCert_A4     := "CERT_IUT_A4_AT"; 

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

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

        const charstring cc_iutCert_A_N   := "CERT_IUT_A_N_AT";

        const charstring cc_iutCert_A_N   := "CERT_IUT_A_N_AT";

        const charstring cc_iutCert_A_B_N := "CERT_IUT_A_B_N_AT";

        const charstring cc_iutCert_A_B_N := "CERT_IUT_A_B_N_AT";

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

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

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

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

        const charstring cc_iutCert_A_B3_N := "CERT_IUT_A_B3_N_AT";

        const charstring cc_iutCert_B     := "CERT_IUT_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */

        const charstring cc_iutCert_B     := "CERT_IUT_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */

        const charstring cc_iutCert_C     := "CERT_IUT_C_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */

        const charstring cc_iutCert_C     := "CERT_IUT_C_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */

        const charstring cc_iutCert_D     := "CERT_IUT_D_AT"; /** Certificate with a polygonal region, to be used when secured messages are sent from TA to IUT */

        const charstring cc_iutCert_D     := "CERT_IUT_D_AT"; /** Certificate with a polygonal region, to be used when secured messages are sent from TA to IUT */
@@ -183,8 +191,6 @@ module LibItsSecurity_TypesAndValues { 
            Bit1        noPassingForTrucks,

            Bit1        noPassingForTrucks,

            Bit1        speedLimit,

            Bit1        speedLimit,

            Bit18       reserved

            Bit18       reserved

        } with {

          variant "FIELDORDER(msb)"

        } // End of type SspCAM

        } // End of type SspCAM

        

        

        /**

        /**
@@ -242,8 +248,6 @@ module LibItsSecurity_TypesAndValues { 
            Bit1        signalViolation,

            Bit1        signalViolation,

            Bit1        dangerousSituation,

            Bit1        dangerousSituation,

            Bit8        reserved

            Bit8        reserved

        } with {

          variant "FIELDORDER(msb)"

        } // End of type SspDENM

        } // End of type SspDENM

        

        

    } // End of group certificateSpecification

    } // End of group certificateSpecification
@@ -303,6 +307,5 @@ module LibItsSecurity_TypesAndValues { 
    } // End of group utPrimitives

    } // End of group utPrimitives

        

        

} with {

} with {

    variant ""

    encode "LibItsSecurity"

    encode "LibItsSecurity"

} // End of module LibItsSecurity_TypesAndValues
 
} // End of module LibItsSecurity_TypesAndValues