Commit 4dfd17b5 authored by garciay's avatar garciay
Browse files

Bug fixed in scripts

parent b82d7916

ttcn/TestCodec/TestCodec_Certificates.ttcn

+6 −5
Changes for ttcn/TestCodec/TestCodec_Certificates.ttcn: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -757,9 +757,10 @@ module TestCodec_Certificates { 
  } // End of testcase tc_at_certificate_sha256_3

   

  testcase tc_certificate_asn1c_1() runs on TCType system TCType { // CERT_IUT_A_RCA

    const octetstring c_cert := '8003008100288300000000001874e3808466a8c001012080010780012482080301ffff0301ffff800125820a0401ffffff0401ffffff800189820a0401ffffff0401ffffff80018a820a0401ffffff0401ffffff80018b820a0401ffffff0401ffffff80018c820a0401ffffff0401ffffff00018d00808082cb6d12f0886798e4c2fac41e92e5cdf6c81682e705e0c2905b5aeaceca5bddae8080424789359de2597ab0d78a17f08acdebb10d31d3f0a25b1362e0b56c1a5080135638e7e68c8bf24a0356e570df6465b980ed52317db89822d099c6e6ee72d39d'O; // CERT_IUT_A_RCA.vkey

    var EtsiTs103097Certificate v_cert_dec;

    var Oct32 v_private_key := 'a005b04678dd9c1fb4f4f99816badd4bda288721c05c5108c4352c24cb539b07'O; // CERT_IUT_A_RCA.vkey

    var bitstring v_enc_msg := oct2bit('8003008100288300000000001874e3808466a8c001012080010780012482080301ffff0301ffff800125820a0401ffffff0401ffffff800189820a0401ffffff0401ffffff80018a820a0401ffffff0401ffffff80018b820a0401ffffff0401ffffff80018c820a0401ffffff0401ffffff00018d00808082cb6d12f0886798e4c2fac41e92e5cdf6c81682e705e0c2905b5aeaceca5bddae8080424789359de2597ab0d78a17f08acdebb10d31d3f0a25b1362e0b56c1a5080135638e7e68c8bf24a0356e570df6465b980ed52317db89822d099c6e6ee72d39d'O); // CERT_IUT_A_RCA.oer

    var Oct32 v_private_key := 'a005b04678dd9c1fb4f4f99816badd4bda288721c05c5108c4352c24cb539b07'O;

    var bitstring v_enc_msg := oct2bit(c_cert);

    var integer v_compressedMode;

    var Oct32 v_publicKeyCompressed := int2oct(0, 32);

    var Oct32 v_sig := int2oct(0, 32);
@@ -888,13 +889,13 @@ module TestCodec_Certificates { 
    }

    

    // Create signature and compare with cprovide one

    v_enc_msg := encvalue(v_cert_exp.toBeSigned);

    /*v_enc_msg := encvalue(v_cert_exp);

    v_sig := f_signWithEcdsaNistp256WithSha256(bit2oct(v_enc_msg), int2oct(0, 32), v_private_key);

    if (not(match(v_sig, v_cert_dec.signature_.ecdsaNistP256Signature.rSig.x_only & v_cert_dec.signature_.ecdsaNistP256Signature.sSig))) {

        setverdict(fail, "Signature generation mismatch");

      } else {

        setverdict(pass, "Signature generation match");

    }

    }*/

    

    if (ischosen(v_cert_dec.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaNistP256.compressed_y_0)) {

      v_compressedMode := 0;
@@ -904,7 +905,7 @@ module TestCodec_Certificates { 
      v_publicKeyCompressed := v_cert_dec.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaNistP256.compressed_y_1;

    }

    if (f_verifyWithEcdsaNistp256WithSha256(

                                            bit2oct(v_enc_msg), 

                                            c_cert, 

                                            int2oct(0, 32),

                                            v_cert_dec.signature_.ecdsaNistP256Signature.rSig.x_only & v_cert_dec.signature_.ecdsaNistP256Signature.sSig,

                                            v_publicKeyCompressed,