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:
7e36529
)
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 17:01:52 +0000
(18:01 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit
2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc
)
crypto/pem/pem_pk8.c
patch
|
blob
|
history
diff --git
a/crypto/pem/pem_pk8.c
b/crypto/pem/pem_pk8.c
index b98c76c4a9914d196d338b9bc6f9682dced62d0b..5747c7366e3d0ac792caaba09150242960a3e075 100644
(file)
--- a/
crypto/pem/pem_pk8.c
+++ b/
crypto/pem/pem_pk8.c
@@
-138,6
+138,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