[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  ed086e2318fb97ebafcd724fbfd1834e17d581d9 (commit)
      from  36fc5fc6bd5ca53fb30aabc38e3fefbab0005b2c (commit)


- Log -----------------------------------------------------------------
commit ed086e2318fb97ebafcd724fbfd1834e17d581d9
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Tue Jan 14 11:09:30 2020 +0300

    Restoring correct check for legacy PKEY
    
    The fix inroduced in #10758 was rolled back by accident.
    Restoring it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10839)

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

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 428b97b7b5..24e2fdc9b6 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -150,7 +150,7 @@ static EVP_PKEY_CTX *int_ctx_new(OPENSSL_CTX *libctx,
      * If the key doesn't contain anything legacy, then it must be provided,
      * so we extract the necessary information and use that.
      */
-    if (pkey != NULL && pkey->pkey.ptr == NULL) {
+    if (pkey != NULL && pkey->ameth == NULL) {
         /* If we have an engine, something went wrong somewhere... */
         if (!ossl_assert(e == NULL))
             return NULL;