From: Shane Lontis <shane.lontis@oracle.com>
Date: Fri, 19 Feb 2021 09:43:16 +0000 (+1000)
Subject: Fix merge problem in d2i_PrivateKey_ex
X-Git-Tag: openssl-3.0.0-alpha13~256
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3352dc185fde9861b58ca7621b4062bb42ec1b55;p=thirdparty%2Fopenssl.git

Fix merge problem in d2i_PrivateKey_ex

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14243)
---

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 21ae90e8e29..c657f0f3a74 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -44,9 +44,9 @@ EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp,
         ppkey = a;
 
     for (i = 0;  i < (int)OSSL_NELEM(input_structures); ++i) {
-        dctx = OSSL_DECODER_CTX_new_by_EVP_PKEY(ppkey, "DER",
-                                                input_structures[i], key_name,
-                                                EVP_PKEY_KEYPAIR, libctx, propq);
+        dctx = OSSL_DECODER_CTX_new_for_pkey(ppkey, "DER",
+                                             input_structures[i], key_name,
+                                             EVP_PKEY_KEYPAIR, libctx, propq);
         if (dctx == NULL)
             return NULL;