Commit 728cd506 authored by Yann Garcia's avatar Yann Garcia
Browse files

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

parents 79d224fe 402e5224

ttcn/Pki/LibItsPki_Functions.ttcn

+7 −7
Original line number Diff line number Diff line
@@ -2930,7 +2930,7 @@ module LibItsPki_Functions { 
              return false;

            }

          }

          if (ispresent(v_etsi_ts_102941_data.content.enrolmentResponse) and ispresent(v_etsi_ts_102941_data.content.enrolmentResponse.certificate)) {

          if (ischosen(v_etsi_ts_102941_data.content.enrolmentResponse) and ispresent(v_etsi_ts_102941_data.content.enrolmentResponse.certificate)) {

            if (f_verify_ec_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, vc_eaCertificate, p_compressed_public_key, p_compressed_mode) == false) {

              log("f_await_http_inner_ec_request_response: Cannot verify EC certificate signature ***");

              if (p_strict_checks) {
@@ -3630,16 +3630,16 @@ module LibItsPki_Functions { 
            v_verification_key.ecdsaNistP256.compressed_y_1 := substr(PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY, 1, 32);

          }

        } else if (PX_VE_ALG == e_brainpool_p256_r1) {

          if (PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY[0] == '02'O) {

            v_verification_key.ecdsaNistP256.compressed_y_0 := substr(PICS_ITS_S_SIGN_BRAINPOOLP256r1_PUBLIC_KEY, 1, 32);

          if (PICS_ITS_S_SIGN_BRAINPOOLP256r1_PUBLIC_KEY[0] == '02'O) {

            v_verification_key.ecdsaBrainpoolP256r1.compressed_y_0 := substr(PICS_ITS_S_SIGN_BRAINPOOLP256r1_PUBLIC_KEY, 1, 32);

          } else {

            v_verification_key.ecdsaNistP256.compressed_y_1 := substr(PICS_ITS_S_SIGN_BRAINPOOLP256r1_PUBLIC_KEY, 1, 32);

            v_verification_key.ecdsaBrainpoolP256r1.compressed_y_1 := substr(PICS_ITS_S_SIGN_BRAINPOOLP256r1_PUBLIC_KEY, 1, 32);

          }

        } else if (PX_VE_ALG == e_brainpool_p384_r1) {

          if (PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY[0] == '02'O) {

            v_verification_key.ecdsaNistP256.compressed_y_0 := substr(PICS_ITS_S_SIGN_BRAINPOOLP384r1_PUBLIC_KEY, 1, 48);

          if (PICS_ITS_S_SIGN_BRAINPOOLP384r1_PUBLIC_KEY[0] == '02'O) {

            v_verification_key.ecdsaBrainpoolP384r1.compressed_y_0 := substr(PICS_ITS_S_SIGN_BRAINPOOLP384r1_PUBLIC_KEY, 1, 48);

          } else {

            v_verification_key.ecdsaNistP256.compressed_y_1 := substr(PICS_ITS_S_SIGN_BRAINPOOLP384r1_PUBLIC_KEY, 1, 48);

            v_verification_key.ecdsaBrainpoolP384r1.compressed_y_1 := substr(PICS_ITS_S_SIGN_BRAINPOOLP384r1_PUBLIC_KEY, 1, 48);

          }

        }

        log("f_verify_pki_request_message: v_verification_key=", v_verification_key);