Commit bc3c236f authored by garciay's avatar garciay
Browse files

STF545: Start ECIES implementation

parent 8071a2d8
Loading
Loading
Loading
Loading
+5 −5
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ module TestCodec_SignedAndEncryptedMessages {
    var Oct32 v_publicEncKeyX;
    var Oct32 v_publicEncKeyX;
    var Oct32 v_publicEncKeyY;
    var Oct32 v_publicEncKeyY;
    var Oct16 v_authentication_vector;
    var Oct16 v_authentication_vector;
    var Oct16 v_hmac;
    var Oct16 v_encrypted_sym_key;
    var Opaque v_cypheredPayload;
    var Opaque v_cypheredPayload;
    var Oct12 v_nonce;
    var Oct12 v_nonce;
    var HashedId8 v_recipientId;
    var HashedId8 v_recipientId;
@@ -181,7 +181,7 @@ module TestCodec_SignedAndEncryptedMessages {
                                              );
                                              );
    log("v_signed_data = ", v_signed_data);
    log("v_signed_data = ", v_signed_data);
    v_encMsg := encvalue(valueof(v_signed_data));
    v_encMsg := encvalue(valueof(v_signed_data));
    v_cypheredPayload := f_encryptWithEciesNistp256WithSha256(bit2oct(v_encMsg), v_tsPublicKeyX, v_tsPublicKeyY, v_publicEncKeyX, v_publicEncKeyY, v_hmac, v_authentication_vector, v_nonce);
    v_cypheredPayload := f_encryptWithEciesNistp256WithSha256(bit2oct(v_encMsg), v_tsPublicKeyX, v_tsPublicKeyY, v_publicEncKeyX, v_publicEncKeyY, v_encrypted_sym_key, v_authentication_vector, v_nonce);
    v_recipientId := f_HashedId8FromSha256(f_hashWithSha256(bit2oct(v_encMsg))); // IEEE Std 1609.2a-2017 Clause 6.3.34 PKRecipientInfo
    v_recipientId := f_HashedId8FromSha256(f_hashWithSha256(bit2oct(v_encMsg))); // IEEE Std 1609.2a-2017 Clause 6.3.34 PKRecipientInfo
    v_encrypted_data := m_etsiTs103097Data_encrypted(
    v_encrypted_data := m_etsiTs103097Data_encrypted(
                                                   m_encryptedData(
                                                   m_encryptedData(
@@ -195,7 +195,7 @@ module TestCodec_SignedAndEncryptedMessages {
                                                                                                                                                                                                                                v_publicEncKeyX, 
                                                                                                                                                                                                                                v_publicEncKeyX, 
                                                                                                                                                                                                                                v_publicEncKeyY
                                                                                                                                                                                                                                v_publicEncKeyY
                                                                                                                                                                                                                                ),
                                                                                                                                                                                                                                ),
                                                                                                                                                                                               v_hmac, 
                                                                                                                                                                                               v_encrypted_sym_key, 
                                                                                                                                                                                               v_authentication_vector
                                                                                                                                                                                               v_authentication_vector
                                                                       ))))
                                                                       ))))
                                                                   },
                                                                   },
@@ -211,10 +211,10 @@ module TestCodec_SignedAndEncryptedMessages {
    v_encMsg := encvalue(valueof(v_encrypted_data));
    v_encMsg := encvalue(valueof(v_encrypted_data));
    setverdict(pass, "Encoding passed.");
    setverdict(pass, "Encoding passed.");
    if (decvalue(v_encMsg, v_encrypted_data_dec) != 0) {
    if (decvalue(v_encMsg, v_encrypted_data_dec) != 0) {
      setverdict(fail);
      setverdict(fail, "decvalue failed");
      stop;
      stop;
    } else if (not(match(valueof(v_encrypted_data), v_encrypted_data_dec))) {
    } else if (not(match(valueof(v_encrypted_data), v_encrypted_data_dec))) {
      setverdict(fail);
      setverdict(fail, "Encode/decode mismatch");
      stop;
      stop;
    }
    }
    setverdict(pass, "Decoding passed.");
    setverdict(pass, "Decoding passed.");