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 /providers/common | |
| 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 'providers/common')
| -rw-r--r-- | providers/common/provider_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index a0787a67e5..f6155e7dce 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -192,8 +192,8 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx, if (macname != NULL) { EVP_MAC *mac = EVP_MAC_fetch(libctx, macname, properties); - EVP_MAC_free_ctx(*macctx); - *macctx = mac == NULL ? NULL : EVP_MAC_new_ctx(mac); + EVP_MAC_CTX_free(*macctx); + *macctx = mac == NULL ? NULL : EVP_MAC_CTX_new(mac); /* The context holds on to the MAC */ EVP_MAC_free(mac); if (*macctx == NULL) @@ -244,10 +244,10 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx, #endif *mp = OSSL_PARAM_construct_end(); - if (EVP_MAC_set_ctx_params(*macctx, mac_params)) + if (EVP_MAC_CTX_set_params(*macctx, mac_params)) return 1; - EVP_MAC_free_ctx(*macctx); + EVP_MAC_CTX_free(*macctx); *macctx = NULL; return 0; } |