[openssl] openssl-3.0 update
tomas at openssl.org
tomas at openssl.org
Wed Jan 12 12:03:51 UTC 2022
The branch openssl-3.0 has been updated
via 3dcec2fb274235e938ce04f43e3e2f6d5743ae52 (commit)
from 3755dc294d2e24b741e235550d063850464467cb (commit)
- Log -----------------------------------------------------------------
commit 3dcec2fb274235e938ce04f43e3e2f6d5743ae52
Author: Tomas Mraz <tomas at openssl.org>
Date: Mon Jan 10 17:09:59 2022 +0100
EVP_DigestSignFinal: *siglen should not be read if sigret == NULL
This fixes small regression from #16962.
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17460)
(cherry picked from commit a4e01187d3648d9ce99507097400902cf21f9b55)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/m_sigver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 9188edbc21..7409780065 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -480,14 +480,14 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
if (sigret == NULL || (ctx->flags & EVP_MD_CTX_FLAG_FINALISE) != 0)
return pctx->op.sig.signature->digest_sign_final(pctx->op.sig.algctx,
sigret, siglen,
- (siglen == NULL) ? 0 : *siglen);
+ sigret == NULL ? 0 : *siglen);
dctx = EVP_PKEY_CTX_dup(pctx);
if (dctx == NULL)
return 0;
r = dctx->op.sig.signature->digest_sign_final(dctx->op.sig.algctx,
sigret, siglen,
- (siglen == NULL) ? 0 : *siglen);
+ *siglen);
EVP_PKEY_CTX_free(dctx);
return r;
More information about the openssl-commits
mailing list