From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Thu, 25 Mar 2021 15:20:48 +0000 (+0100)
Subject: d2i_PrivateKey_decoder(): Fix premature exit on unsuccessful OSSL_DECODER_CTX_new_for... 
X-Git-Tag: openssl-3.0.0-alpha15~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d9e045ef724df0ddc8c8f66dcfdff4f8ba0bc03;p=thirdparty%2Fopenssl.git

d2i_PrivateKey_decoder(): Fix premature exit on unsuccessful OSSL_DECODER_CTX_new_for_pkey()

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

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 9d9c1898cb9..94bd341d587 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -52,7 +52,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
         if (a != NULL)
             *a = bak_a;
         if (dctx == NULL)
-            return NULL;
+            continue;
 
         ret = OSSL_DECODER_from_data(dctx, pp, &len);
         OSSL_DECODER_CTX_free(dctx);