From 8086b267fb3395c53cd5fc29eea68ba4826b333d Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 11 Jan 2022 17:13:39 +0000 Subject: Clear md_data only when necessary PR #17255 fixed a bug in EVP_DigestInit_ex(). While backporting the PR to 1.1.1 (see #17472) I spotted an error in the original patch. This fixes it. Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17473) --- crypto/evp/digest.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crypto/evp') diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index cdcb60092e..d4685e6489 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -33,9 +33,10 @@ static void cleanup_old_md_data(EVP_MD_CTX *ctx, int force) ctx->digest->cleanup(ctx); if (ctx->md_data != NULL && ctx->digest->ctx_size > 0 && (!EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE) - || force)) + || force)) { OPENSSL_clear_free(ctx->md_data, ctx->digest->ctx_size); - ctx->md_data = NULL; + ctx->md_data = NULL; + } } } -- cgit v1.2.3