diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-11 16:41:52 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-12 10:19:24 +0100 |
| commit | a01087027bd0c5ec053d4eabd972bd942bfcd92f (patch) | |
| tree | 15dba83fb5d58c761609d77871fd050dde21ddd1 /crypto/evp | |
| parent | Fix error handling in bn_exp (diff) | |
| download | openssl-a01087027bd0c5ec053d4eabd972bd942bfcd92f.tar.xz openssl-a01087027bd0c5ec053d4eabd972bd942bfcd92f.zip | |
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 <appro@openssl.org>
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/digest.c | 9 |
1 files 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) { |