diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-25 13:50:01 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-28 17:25:49 +1000 |
| commit | 77e4ae58ea05d08851d8919543f9993fd06e113e (patch) | |
| tree | 594363eed1ae64cdfd72d399d5a5e626c05d5568 /test | |
| parent | 41df96efc150d3ccee01ab692d882ddba3d2d3d8 (diff) | |
test: updates for the new additional MAC_init arguments
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
Diffstat (limited to 'test')
| -rw-r--r-- | test/bad_dtls_test.c | 9 | ||||
| -rw-r--r-- | test/ossl_shim/ossl_shim.cc | 8 | ||||
| -rw-r--r-- | test/sslapitest.c | 11 |
3 files changed, 9 insertions, 19 deletions
diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c index bfbaa7953a..0eef2a2239 100644 --- a/test/bad_dtls_test.c +++ b/test/bad_dtls_test.c @@ -286,7 +286,7 @@ static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr, unsigned char iv[16]; unsigned char pad; unsigned char *enc; - OSSL_PARAM params[3]; + OSSL_PARAM params[2]; seq[0] = (seqnr >> 40) & 0xff; seq[1] = (seqnr >> 32) & 0xff; @@ -309,11 +309,8 @@ static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr, EVP_MAC_free(hmac); params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, "SHA1", 0); - params[1] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, - mac_key, 20); - params[2] = OSSL_PARAM_construct_end(); - EVP_MAC_CTX_set_params(ctx, params); - EVP_MAC_init(ctx); + params[1] = OSSL_PARAM_construct_end(); + EVP_MAC_init(ctx, mac_key, 20, params); EVP_MAC_update(ctx, epoch, 2); EVP_MAC_update(ctx, seq, 6); EVP_MAC_update(ctx, &type, 1); diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc index 380e6853c6..eff0b3eb9b 100644 --- a/test/ossl_shim/ossl_shim.cc +++ b/test/ossl_shim/ossl_shim.cc @@ -373,7 +373,7 @@ static int NewSessionCallback(SSL *ssl, SSL_SESSION *session) { static int TicketKeyCallback(SSL *ssl, uint8_t *key_name, uint8_t *iv, EVP_CIPHER_CTX *ctx, EVP_MAC_CTX *hmac_ctx, int encrypt) { - OSSL_PARAM params[3], *p = params; + OSSL_PARAM params[2], *p = params; if (!encrypt) { if (GetTestState(ssl)->ticket_decrypt_done) { @@ -396,14 +396,10 @@ static int TicketKeyCallback(SSL *ssl, uint8_t *key_name, uint8_t *iv, *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, const_cast<char *>("SHA256"), 0); - *p++ = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, - (void *)kZeros, - sizeof(kZeros)); *p = OSSL_PARAM_construct_end(); if (!EVP_CipherInit_ex(ctx, EVP_aes_128_cbc(), NULL, kZeros, iv, encrypt) - || !EVP_MAC_init(hmac_ctx) - || !EVP_MAC_CTX_set_params(hmac_ctx, params)) { + || !EVP_MAC_init(hmac_ctx, kZeros, sizeof(kZeros), params)) { return -1; } diff --git a/test/sslapitest.c b/test/sslapitest.c index b6eb6c16db..3fa60538e9 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -6858,7 +6858,7 @@ static int tick_key_evp_cb(SSL *s, unsigned char key_name[16], { const unsigned char tick_aes_key[16] = "0123456789abcdef"; unsigned char tick_hmac_key[16] = "0123456789abcdef"; - OSSL_PARAM params[3]; + OSSL_PARAM params[2]; EVP_CIPHER *aes128cbc = EVP_CIPHER_fetch(libctx, "AES-128-CBC", NULL); int ret; @@ -6867,14 +6867,11 @@ static int tick_key_evp_cb(SSL *s, unsigned char key_name[16], memset(key_name, 0, 16); params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, "SHA256", 0); - params[1] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, - tick_hmac_key, - sizeof(tick_hmac_key)); - params[2] = OSSL_PARAM_construct_end(); + params[1] = OSSL_PARAM_construct_end(); if (aes128cbc == NULL || !EVP_CipherInit_ex(ctx, aes128cbc, NULL, tick_aes_key, iv, enc) - || !EVP_MAC_CTX_set_params(hctx, params) - || !EVP_MAC_init(hctx)) + || !EVP_MAC_init(hctx, tick_hmac_key, sizeof(tick_hmac_key), + params)) ret = -1; else ret = tick_key_renew ? 2 : 1; |