From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Tue, 14 Jan 2020 08:09:30 +0000 (+0300)
Subject: Restoring correct check for legacy PKEY
X-Git-Tag: openssl-3.0.0-alpha1~680
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed086e2318fb97ebafcd724fbfd1834e17d581d9;p=oweals%2Fopenssl.git

Restoring correct check for legacy PKEY

The fix inroduced in #10758 was rolled back by accident.
Restoring it.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10839)
---

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;