The branch master has been updated
via 5a8848fa7fec532fee30fd6131a3ebd59a5c5902 (commit)
from 7f293d9f3b5cee4f4b15624fff15a45e0517334f (commit)
- Log -----------------------------------------------------------------
commit 5a8848fa7fec532fee30fd6131a3ebd59a5c5902
Author: Matt Caswell <[email protected]>
Date: Fri Jan 31 22:44:56 2020 +0000
Revert "Legacy digests can have custom control values"
This reverts commit 1f457256ce6a1b2fd7e3f62eee8faa74cd5c835e.
This is causing Travis failures.
[extended tests]
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/10989)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/digest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
