Commit cabcd97c authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525

parents 58cdf525 647b7e24

.TITAN_properties

+2 −2
Original line number Diff line number Diff line
@@ -289,13 +289,13 @@ 
      </FileProperties>

    </FileResource>

    <FileResource>

      <FilePath>ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPkiPort.cc</FilePath>

      <FilePath>ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC</FilePath>

      <FileProperties>

        <ExcludeFromBuild>true</ExcludeFromBuild>

      </FileProperties>

    </FileResource>

    <FileResource>

      <FilePath>ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPkiPort.hh</FilePath>

      <FilePath>ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partH</FilePath>

      <FileProperties>

        <ExcludeFromBuild>true</ExcludeFromBuild>

      </FileProperties>

ttcn/AtsPki/ItsPki_TestCases.ttcn

+55 −55

File changed.

Preview size limit exceeded, changes collapsed.

LibIts @ f10fbd8c

Compare aa5c210a to f10fbd8c
Original line number Diff line number Diff line 
Subproject commit aa5c210a36c8d7aa155f4cc972c49db08f9b7f0f
 
Subproject commit f10fbd8c89c6daac283cb28a548150f604af0a62

ttcn/TestCodec/TestCodec_Pki.ttcn

+8 −5
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ module TestCodec_Pki { 
    var Ieee1609Dot2Data v_dec_ieee1609dot2_encrypted_and_signed_data;

    var Ieee1609Dot2Data v_dec_ieee1609dot2_signed_data;

    var bitstring v_ieee1609dot2_signed_and_encrypted_data_msg;

    var Oct32 v_request_hash;

    var Oct16 v_aes_sym_key;

    var Oct16 v_encrypted_sym_key;

    var Oct16 v_authentication_vector;
@@ -181,7 +182,7 @@ module TestCodec_Pki { 
    

    // Secure InnerEcRequestSignedForPoP message

    v_inner_ec_request_signed_for_pop_msg := encvalue(m_etsiTs102941Data_inner_ec_request_signed_for_pop(v_inner_ec_request_signed_for_pop));

    if (f_build_pki_secured_message(v_private_key, valueof(m_signerIdentifier_self), int2oct(0, 8), v_publicKeyCompressed, v_compressedMode, ''O, bit2oct(v_inner_ec_request_signed_for_pop_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce) == false) {

    if (f_build_pki_secured_message(v_private_key, valueof(m_signerIdentifier_self), int2oct(0, 8), v_publicKeyCompressed, v_compressedMode, ''O, bit2oct(v_inner_ec_request_signed_for_pop_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_request_hash) == false) {

      setverdict(fail, "Failed to secure InnerEcRequest message");

      stop;

    }
@@ -418,6 +419,7 @@ module TestCodec_Pki { 
    var InnerEcResponse v_inner_ec_response;

    var Ieee1609Dot2Data v_ieee1609dot2_signed_and_encrypted_data;

    var bitstring v_ieee1609dot2_signed_and_encrypted_data_msg;

    var Oct32 v_request_hash;

    var Oct16 v_aes_sym_key;

    var Oct16 v_encrypted_sym_key;

    var Oct16 v_authentication_vector;
@@ -502,9 +504,9 @@ module TestCodec_Pki { 
    // Build secured PKI message

    v_enc_msg := encvalue(m_etsiTs102941Data_inner_ec_response(v_inner_ec_response));

    if (ischosen(v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_0)) {

      v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_0, 0, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce);

      v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_0, 0, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_request_hash);

    } else {

      v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_1, 1, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce);

      v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_1, 1, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_request_hash);

    }

    if (v_ret == false) {

      setverdict(fail, "Failed to secure InnerEcResponse message");
@@ -623,6 +625,7 @@ module TestCodec_Pki { 
    var Ieee1609Dot2Data v_ieee1609dot2_signed_and_encrypted_data;

    var bitstring v_ieee1609dot2_signed_and_encrypted_data_msg;

    var Ieee1609Dot2Data v_dec_ieee1609dot2_encrypted_and_signed_data;

    var Oct32 v_request_hash;

    var Oct16 v_aes_sym_key;

    var Oct16 v_encrypted_sym_key;

    var Oct16 v_authentication_vector;
@@ -715,9 +718,9 @@ module TestCodec_Pki { 
    // Build secured PKI message

    v_enc_msg := encvalue(m_etsiTs102941Data_authorization_validation_response(v_authorization_validation_response));

    if (ischosen(v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_0)) {

    v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_0, 0, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce);

    v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_0, 0, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_request_hash);

    } else {

    v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_1, 1, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce);

    v_ret := f_build_pki_secured_message(v_private_key_cert_iut_a_ea, valueof(m_signerIdentifier_digest(v_hashed_id8_cert_iut_a_ea)), int2oct(0, 8), v_cert_ts_a_ea.toBeSigned.encryptionKey.publicKey.eciesNistP256.compressed_y_1, 1, ''O, bit2oct(v_enc_msg), v_ieee1609dot2_signed_and_encrypted_data, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_request_hash);

    }

    if (v_ret == false) {

      setverdict(fail, "Failed to secure InnerEcResponse message");