[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  48bb979252deb4ca51ac9b3cdad70ee92937da4f (commit)
      from  187753e09ceab4c85a0041844e749658e8f712d3 (commit)


- Log -----------------------------------------------------------------
commit 48bb979252deb4ca51ac9b3cdad70ee92937da4f
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Oct 20 20:49:32 2019 +0200

    crypto/evp/pmeth_lib.c: Fix copy'n'paste error
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10227)

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

Summary of changes:
 crypto/evp/pmeth_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index c840a12b00..1186e5ba3a 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -634,7 +634,7 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
     }
 
     if ((EVP_PKEY_CTX_IS_DERIVE_OP(ctx) && ctx->op.kex.exchprovctx != NULL)
-            || (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
+            || (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
                 && ctx->op.sig.sigprovctx != NULL))
         return legacy_ctrl_to_param(ctx, keytype, optype, cmd, p1, p2);