diff options
author | Matt Caswell <matt@openssl.org> | 2020-06-18 09:26:22 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-07-16 14:21:07 +0200 |
commit | 865adf97c9b8271788ee7293ecde9e8a643a1c45 (patch) | |
tree | d4fe29fa8c0587aa4316dc550d57526559f6f6f3 /apps/lib | |
parent | 8dab4de53887639abc1152288fac76506beb87b3 (diff) |
Revert "The EVP_MAC functions have been renamed for consistency. The EVP_MAC_CTX_*"
The commit claimed to make things more consistent. In fact it makes it
less so. Revert back to the previous namig convention.
This reverts commit d9c2fd51e2e278bc3f7793a104ff7b4879f6d63a.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12186)
Diffstat (limited to 'apps/lib')
-rw-r--r-- | apps/lib/s_cb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c index de72bde9ed..ba9ef12afb 100644 --- a/apps/lib/s_cb.c +++ b/apps/lib/s_cb.c @@ -788,7 +788,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie, BIO_printf(bio_err, "HMAC not found\n"); goto end; } - ctx = EVP_MAC_new_ctx(hmac); + ctx = EVP_MAC_CTX_new(hmac); if (ctx == NULL) { BIO_printf(bio_err, "HMAC context allocation failed\n"); goto end; @@ -797,7 +797,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie, *p++ = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, cookie_secret, COOKIE_SECRET_LENGTH); *p = OSSL_PARAM_construct_end(); - if (!EVP_MAC_set_ctx_params(ctx, params)) { + if (!EVP_MAC_CTX_set_params(ctx, params)) { BIO_printf(bio_err, "HMAC context parameter setting failed\n"); goto end; } |