summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-03-25 16:20:48 +0100
committerDr. David von Oheimb <dev@ddvo.net>2021-04-08 15:18:58 +0200
commit6d9e045ef724df0ddc8c8f66dcfdff4f8ba0bc03 (patch)
tree3106b5b285db7b320a95b50d1b7dca631f2ac6ed
parentPEM_X509_INFO_read_bio_ex(): Generalize to allow parsing any type of private key (diff)
downloadopenssl-6d9e045ef724df0ddc8c8f66dcfdff4f8ba0bc03.tar.xz
openssl-6d9e045ef724df0ddc8c8f66dcfdff4f8ba0bc03.zip
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)
-rw-r--r--crypto/asn1/d2i_pr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 9d9c1898cb..94bd341d58 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);