diff options
| author | Matt Caswell <matt@openssl.org> | 2022-01-11 17:13:39 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2022-01-13 11:57:59 +0000 |
| commit | 16535ba9b86dcb99558201e66613f018fb1d3f65 (patch) | |
| tree | 07e3289874db3845e3ec6788987f6b0bff0deffc /crypto/evp | |
| parent | 589e0ab4ebf35e1e73d826ad08160b9e6060e616 (diff) | |
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)
(cherry picked from commit 8086b267fb3395c53cd5fc29eea68ba4826b333d)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/digest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index eb6ccfaca2..066f2a4af9 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; + } } } |