From 3352dc185fde9861b58ca7621b4062bb42ec1b55 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Fri, 19 Feb 2021 19:43:16 +1000 Subject: [PATCH] Fix merge problem in d2i_PrivateKey_ex Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14243) --- crypto/asn1/d2i_pr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.47.3