From a01087027bd0c5ec053d4eabd972bd942bfcd92f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 11 Mar 2015 15:41:52 +0000 Subject: [PATCH] Fix EVP_DigestInit_ex with NULL digest Calling EVP_DigestInit_ex which has already had the digest set up for it should be possible. You are supposed to be able to pass NULL for the type. However currently this seg faults. Reviewed-by: Andy Polyakov --- crypto/evp/digest.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index db755b1dbb..48c7b00b4c 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -187,9 +187,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) ctx->engine = impl; } else ctx->engine = NULL; - } else if (!ctx->digest) { - EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET); - return 0; + } else { + if (!ctx->digest) { + EVPerr(EVP_F_EVP_DIGESTINIT_EX, EVP_R_NO_DIGEST_SET); + return 0; + } + type = ctx->digest; } #endif if (ctx->digest != type) { -- 2.34.1