projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4957d95
)
d2i_PrivateKey_decoder(): Fix premature exit on unsuccessful OSSL_DECODER_CTX_new_for...
author
Dr. David von Oheimb
<David.von.Oheimb@siemens.com>
Thu, 25 Mar 2021 15:20:48 +0000
(16:20 +0100)
committer
Dr. David von Oheimb
<dev@ddvo.net>
Thu, 8 Apr 2021 13:18:58 +0000
(15:18 +0200)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14647)
crypto/asn1/d2i_pr.c
patch
|
blob
|
history
diff --git
a/crypto/asn1/d2i_pr.c
b/crypto/asn1/d2i_pr.c
index 9d9c1898cb9f636e7493a413e80dc0240f13806e..94bd341d587ca18f5735c534477118cfb4099af9 100644
(file)
--- 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);