From 11a044af6ed36f833e15b30ce742842318bc20cc Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 23 Nov 2021 15:52:04 +0100 Subject: EVP_MD_CTX_copy_ex: Allow copying uninitialized digest contexts Fixes #17117 Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17118) (cherry picked from commit 9ece8323ea2230092227bf20e5d93012d15d92e9) --- crypto/evp/digest.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'crypto/evp') diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index a269bb8260..d3a28fa351 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -509,11 +509,20 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in) { unsigned char *tmp_buf; - if (in == NULL || in->digest == NULL) { - ERR_raise(ERR_LIB_EVP, EVP_R_INPUT_NOT_INITIALIZED); + if (in == NULL) { + ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER); return 0; } + if (in->digest == NULL) { + /* copying uninitialized digest context */ + EVP_MD_CTX_reset(out); + if (out->fetched_digest != NULL) + EVP_MD_free(out->fetched_digest); + *out = *in; + return 1; + } + if (in->digest->prov == NULL || (in->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0) goto legacy; -- cgit v1.2.3