root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Revert "Legacy digests can have custom control values" 

This reverts commit 1f457256ce.

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)
This commit is contained in:
Matt Caswell 2020-01-31 22:44:56 +00:00
parent 7f293d9f3b
commit 5a8848fa7f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/digest.c
View File

@ -663,7 +663,7 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
} }
if (ctx->digest->prov == NULL if (ctx->digest->prov == NULL
|| (ctx->pctx == NULL && (ctx->pctx == NULL
|| (ctx->pctx->operation != EVP_PKEY_OP_VERIFYCTX || (ctx->pctx->operation != EVP_PKEY_OP_VERIFYCTX
&& ctx->pctx->operation != EVP_PKEY_OP_SIGNCTX))) && ctx->pctx->operation != EVP_PKEY_OP_SIGNCTX)))
goto legacy; goto legacy;