[openssl] master update

[shane . lontis]

The branch master has been updated
       via  3352dc185fde9861b58ca7621b4062bb42ec1b55 (commit)
      from  eabb3014165a1319ceb8a69cc135feb99f288293 (commit)


- Log -----------------------------------------------------------------
commit 3352dc185fde9861b58ca7621b4062bb42ec1b55
Author: Shane Lontis <shane.lon...@oracle.com>
Date:   Fri Feb 19 19:43:16 2021 +1000

    Fix merge problem in d2i_PrivateKey_ex
    
    Reviewed-by: Matt Caswell <m...@openssl.org>
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14243)

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

Summary of changes:
 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 21ae90e8e2..c657f0f3a7 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;