[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  1f457256ce6a1b2fd7e3f62eee8faa74cd5c835e (commit)
      from  32be631ca1f2b73c92e4f7f5d23f1c3aee80ec69 (commit)


- Log -----------------------------------------------------------------
commit 1f457256ce6a1b2fd7e3f62eee8faa74cd5c835e
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Tue Jan 21 20:08:38 2020 +0300

    Legacy digests can have custom control values
    
    Fixes #10915.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10916)

-----------------------------------------------------------------------

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 adde3e13ab..9808b66bbd 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;