mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not fail if ctx dup does not succeed

Browse Source 
If the ctx was *really* needed we'll probably fail later with an error
anyway, so no point in failing immediately.

Document that this behavior is dependent on the provider used to
implement the signature/verification.

Signed-off-by: Simo Sorce <simo@redhat.com>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/20375)
This commit is contained in:
Simo Sorce 2023-02-23 19:51:27 -05:00 committed by Pauli
parent dba97d4c71
commit 0fc00fc0e3
7 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
crypto/evp/m_sigver.c
View File

@ -462,7 +462,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
size_t *siglen)
{
int sctx = 0, r = 0;
EVP_PKEY_CTX *dctx, *pctx = ctx->pctx;
EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
if (pctx == NULL
|| pctx->operation != EVP_PKEY_OP_SIGNCTX
@ -470,17 +470,15 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
|| pctx->op.sig.signature == NULL)
goto legacy;
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,
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,
if (sigret != NULL && (ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
/* try dup */
dctx = EVP_PKEY_CTX_dup(pctx);
if (dctx != NULL)
pctx = dctx;
}
r = pctx->op.sig.signature->digest_sign_final(pctx->op.sig.algctx,
sigret, siglen,
*siglen);
sigret == NULL ? 0 : *siglen);
EVP_PKEY_CTX_free(dctx);
return r;
@ -589,7 +587,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
int r = 0;
unsigned int mdlen = 0;
int vctx = 0;
EVP_PKEY_CTX *dctx, *pctx = ctx->pctx;
EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
if (pctx == NULL
|| pctx->operation != EVP_PKEY_OP_VERIFYCTX
@ -597,14 +595,13 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
|| pctx->op.sig.signature == NULL)
goto legacy;
if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISE) != 0)
return pctx->op.sig.signature->digest_verify_final(pctx->op.sig.algctx,
sig, siglen);
dctx = EVP_PKEY_CTX_dup(pctx);
if (dctx == NULL)
return 0;
r = dctx->op.sig.signature->digest_verify_final(dctx->op.sig.algctx,
if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
/* try dup */
dctx = EVP_PKEY_CTX_dup(pctx);
if (dctx != NULL)
pctx = dctx;
}
r = pctx->op.sig.signature->digest_verify_final(pctx->op.sig.algctx,
sig, siglen);
EVP_PKEY_CTX_free(dctx);
return r;

2
crypto/evp/p_sign.c
View File

@ -39,6 +39,8 @@ int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *sigret,
rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
if (rv)
rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);
else
rv = EVP_DigestFinal_ex(ctx, m, &m_len);
EVP_MD_CTX_free(tmp_ctx);
if (!rv)
return 0;

2
crypto/evp/p_verify.c
View File

@ -37,6 +37,8 @@ int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
rv = EVP_MD_CTX_copy_ex(tmp_ctx, ctx);
if (rv)
rv = EVP_DigestFinal_ex(tmp_ctx, m, &m_len);
else
rv = EVP_DigestFinal_ex(ctx, m, &m_len);
EVP_MD_CTX_free(tmp_ctx);
if (!rv)
return 0;

7
doc/man3/EVP_DigestSignInit.pod
View File

@ -166,6 +166,13 @@ external circumstances (see L<RAND(7)>), the operation will fail.
The call to EVP_DigestSignFinal() internally finalizes a copy of the digest
context. This means that calls to EVP_DigestSignUpdate() and
EVP_DigestSignFinal() can be called later to digest and sign additional data.
Applications may disable this behavior by setting the EVP_MD_CTX_FLAG_FINALISE
context flag via L<EVP_MD_CTX_set_flags(3)>.
Note that not all providers support continuation, in case the selected
provider does not allow to duplicate contexts EVP_DigestSignFinal() will
finalize the digest context and attempting to process additional data via
EVP_DigestSignUpdate() will result in an error.
EVP_DigestSignInit() and EVP_DigestSignInit_ex() functions can be called
multiple times on a context and the parameters set by previous calls should be

9
doc/man3/EVP_DigestVerifyInit.pod
View File

@ -154,7 +154,14 @@ external circumstances (see L<RAND(7)>), the operation will fail.
The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest
context. This means that EVP_VerifyUpdate() and EVP_VerifyFinal() can
be called later to digest and verify additional data.
be called later to digest and verify additional data. Applications may disable
this behavior by setting the EVP_MD_CTX_FLAG_FINALISE context flag via
L<EVP_MD_CTX_set_flags(3)>.
Note that not all providers support continuation, in case the selected
provider does not allow to duplicate contexts EVP_DigestVerifyFinal() will
finalize the digest context and attempting to process additional data via
EVP_DigestVerifyUpdate() will result in an error.
EVP_DigestVerifyInit() and EVP_DigestVerifyInit_ex() functions can be called
multiple times on a context and the parameters set by previous calls should be

9
doc/man3/EVP_SignInit.pod
View File

@ -66,12 +66,19 @@ due to external circumstances (see L<RAND(7)>), the operation will fail.
The call to EVP_SignFinal() internally finalizes a copy of the digest context.
This means that calls to EVP_SignUpdate() and EVP_SignFinal() can be called
later to digest and sign additional data.
later to digest and sign additional data.cApplications may disable this
behavior by setting the EVP_MD_CTX_FLAG_FINALISE context flag via
L<EVP_MD_CTX_set_flags(3)>.
Since only a copy of the digest context is ever finalized the context must
be cleaned up after use by calling EVP_MD_CTX_free() or a memory leak
will occur.
Note that not all providers support continuation, in case the selected
provider does not allow to duplicate contexts EVP_SignFinal() will
finalize the digest context and attempting to process additional data via
EVP_SignUpdate() will result in an error.
=head1 BUGS
Older versions of this documentation wrongly stated that calls to

9
doc/man3/EVP_VerifyInit.pod
View File

@ -62,12 +62,19 @@ transparent to the algorithm used and much more flexible.
The call to EVP_VerifyFinal() internally finalizes a copy of the digest context.
This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can be called
later to digest and verify additional data.
later to digest and verify additional data. Applications may disable this
behavior by setting the EVP_MD_CTX_FLAG_FINALISE context flag via
L<EVP_MD_CTX_set_flags(3)>.
Since only a copy of the digest context is ever finalized the context must
be cleaned up after use by calling EVP_MD_CTX_free() or a memory leak
will occur.
Note that not all providers support continuation, in case the selected
provider does not allow to duplicate contexts EVP_VerifyFinal() will
finalize the digest context and attempting to process additional data via
EVP_VerifyUpdate() will result in an error.
=head1 BUGS
Older versions of this documentation wrongly stated that calls to