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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/t1_lib.c | 8 | ||||
| -rw-r--r-- | ssl/tls13_enc.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 41228d58e9..bf955bf3ec 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -3390,12 +3390,12 @@ SSL_HMAC *ssl_hmac_new(const SSL_CTX *ctx) } #endif mac = EVP_MAC_fetch(ctx->libctx, "HMAC", NULL); - if (mac == NULL || (ret->ctx = EVP_MAC_new_ctx(mac)) == NULL) + if (mac == NULL || (ret->ctx = EVP_MAC_CTX_new(mac)) == NULL) goto err; EVP_MAC_free(mac); return ret; err: - EVP_MAC_free_ctx(ret->ctx); + EVP_MAC_CTX_free(ret->ctx); EVP_MAC_free(mac); OPENSSL_free(ret); return NULL; @@ -3404,7 +3404,7 @@ SSL_HMAC *ssl_hmac_new(const SSL_CTX *ctx) void ssl_hmac_free(SSL_HMAC *ctx) { if (ctx != NULL) { - EVP_MAC_free_ctx(ctx->ctx); + EVP_MAC_CTX_free(ctx->ctx); #ifndef OPENSSL_NO_DEPRECATED_3_0 HMAC_CTX_free(ctx->old_ctx); #endif @@ -3432,7 +3432,7 @@ int ssl_hmac_init(SSL_HMAC *ctx, void *key, size_t len, char *md) *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, md, 0); *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, key, len); *p = OSSL_PARAM_construct_end(); - if (EVP_MAC_set_ctx_params(ctx->ctx, params) && EVP_MAC_init(ctx->ctx)) + if (EVP_MAC_CTX_set_params(ctx->ctx, params) && EVP_MAC_init(ctx->ctx)) return 1; } #ifndef OPENSSL_NO_DEPRECATED_3_0 diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 95e28d6d54..cf8e42c97e 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -360,9 +360,9 @@ size_t tls13_final_finish_mac(SSL *s, const char *str, size_t slen, } *p++ = OSSL_PARAM_construct_end(); - ctx = EVP_MAC_new_ctx(hmac); + ctx = EVP_MAC_CTX_new(hmac); if (ctx == NULL - || !EVP_MAC_set_ctx_params(ctx, params) + || !EVP_MAC_CTX_set_params(ctx, params) || !EVP_MAC_init(ctx) || !EVP_MAC_update(ctx, hash, hashlen) /* outsize as per sizeof(peer_finish_md) */ @@ -375,7 +375,7 @@ size_t tls13_final_finish_mac(SSL *s, const char *str, size_t slen, ret = hashlen; err: OPENSSL_cleanse(finsecret, sizeof(finsecret)); - EVP_MAC_free_ctx(ctx); + EVP_MAC_CTX_free(ctx); EVP_MAC_free(hmac); return ret; } |