From ed086e2318fb97ebafcd724fbfd1834e17d581d9 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Tue, 14 Jan 2020 11:09:30 +0300 Subject: [PATCH] Restoring correct check for legacy PKEY The fix inroduced in #10758 was rolled back by accident. Restoring it. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10839) --- 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; -- 2.25.1