From: Matt Caswell <matt@openssl.org>
Date: Tue, 11 Jan 2022 17:13:39 +0000 (+0000)
Subject: Clear md_data only when necessary
X-Git-Tag: openssl-3.2.0-alpha1~3077
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8086b267fb3395c53cd5fc29eea68ba4826b333d;p=thirdparty%2Fopenssl.git

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 <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17473)
---

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index cdcb60092ea..d4685e64890 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;
+        }
     }
 }