projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bca3f06
)
check for error when creating PKCS#8 structure
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 28 May 2015 14:44:20 +0000
(15:44 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 28 May 2015 16:58:03 +0000
(17:58 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
crypto/pem/pem_pk8.c
patch
|
blob
|
history
diff --git
a/crypto/pem/pem_pk8.c
b/crypto/pem/pem_pk8.c
index 4534eb1ec4ab482bfb8b84d3b0cf2bb917b1f3c8..ef5131fa2939a7a57feed073a6a3c15d5476ac8e 100644
(file)
--- a/
crypto/pem/pem_pk8.c
+++ b/
crypto/pem/pem_pk8.c
@@
-139,6
+139,8
@@
static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid,
if (kstr == buf)
OPENSSL_cleanse(buf, klen);
PKCS8_PRIV_KEY_INFO_free(p8inf);
+ if (p8 == NULL)
+ return 0;
if (isder)
ret = i2d_PKCS8_bio(bp, p8);
else