diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-31 22:44:56 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-03 09:44:05 +0000 |
| commit | 5a8848fa7fec532fee30fd6131a3ebd59a5c5902 (patch) | |
| tree | f1abb37c98ccda1740fbb288702c9539ccaea1a3 /crypto/evp/digest.c | |
| parent | 7f293d9f3b5cee4f4b15624fff15a45e0517334f (diff) | |
Revert "Legacy digests can have custom control values"
This reverts commit 1f457256ce6a1b2fd7e3f62eee8faa74cd5c835e.
This is causing Travis failures.
[extended tests]
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10989)
Diffstat (limited to 'crypto/evp/digest.c')
| -rw-r--r-- | crypto/evp/digest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 9808b66bbd..adde3e13ab 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -663,7 +663,7 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2) } if (ctx->digest->prov == NULL - || (ctx->pctx == NULL + && (ctx->pctx == NULL || (ctx->pctx->operation != EVP_PKEY_OP_VERIFYCTX && ctx->pctx->operation != EVP_PKEY_OP_SIGNCTX))) goto legacy; |