From 3fd7026276475d72a3b5bbbe42cd1f5ff6b0e736 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 3 Sep 2019 17:47:13 +0200 Subject: New function EVP_MD_free() This function re-implements EVP_MD_meth_free(), but has a name that isn't encumbered by legacy EVP_MD construction functionality. We also refactor most of EVP_MD_meth_new() into an internal evp_md_new() that's used when creating fetched methods. EVP_MD_meth_new() and EVP_MD_meth_free() are rewritten in terms of evp_md_new() and EVP_MD_free(). This means that at any time, we can deprecate all the EVP_MD_meth_ functions with no harmful consequence. Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/9758) --- crypto/ec/curve448/eddsa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/ec/curve448') diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c index 58e9e92d4c..45b6c4ab69 100644 --- a/crypto/ec/curve448/eddsa.c +++ b/crypto/ec/curve448/eddsa.c @@ -41,7 +41,7 @@ static c448_error_t oneshot_hash(OPENSSL_CTX *ctx, uint8_t *out, size_t outlen, ret = C448_SUCCESS; err: EVP_MD_CTX_free(hashctx); - EVP_MD_meth_free(shake256); + EVP_MD_free(shake256); return ret; } @@ -77,11 +77,11 @@ static c448_error_t hash_init_with_dom(OPENSSL_CTX *ctx, EVP_MD_CTX *hashctx, || !EVP_DigestUpdate(hashctx, dom_s, strlen(dom_s)) || !EVP_DigestUpdate(hashctx, dom, sizeof(dom)) || !EVP_DigestUpdate(hashctx, context, context_len)) { - EVP_MD_meth_free(shake256); + EVP_MD_free(shake256); return C448_FAILURE; } - EVP_MD_meth_free(shake256); + EVP_MD_free(shake256); return C448_SUCCESS; } -- cgit v1.2.3