root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix two additional instances of the old EVP_MAC_CTX_ functions being used. 

[extended tests]

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/12121)
This commit is contained in:
Pauli 2020-06-12 07:49:18 +10:00
parent 7f81aed4bc
commit 5ea8afd368
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/pkey_mac.c
View File

@ -400,7 +400,7 @@ static int pkey_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
return 0; return 0;
/* /*
* Since EVP_MAC_CTX_{get,set}_params() returned successfully, * Since EVP_MAC_{get,set}_ctx_params() returned successfully,
* we can only assume that the size was ignored, i.e. this * we can only assume that the size was ignored, i.e. this
* control is unsupported. * control is unsupported.
*/ */

2
test/ossl_shim/ossl_shim.cc
View File

@ -403,7 +403,7 @@ static int TicketKeyCallback(SSL *ssl, uint8_t *key_name, uint8_t *iv,
if (!EVP_CipherInit_ex(ctx, EVP_aes_128_cbc(), NULL, kZeros, iv, encrypt) if (!EVP_CipherInit_ex(ctx, EVP_aes_128_cbc(), NULL, kZeros, iv, encrypt)
|| !EVP_MAC_init(hmac_ctx) || !EVP_MAC_init(hmac_ctx)
|| !EVP_MAC_CTX_set_params(hmac_ctx, params)) { || !EVP_MAC_set_ctx_params(hmac_ctx, params)) {
return -1; return -1;
} }