summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-05-28 15:44:20 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-05-28 18:02:43 +0100
commitaaa654d607f85cbab320e712377a8a345fa1158c (patch)
tree8c0f425d60d8b5716aa79e5626f36c947f9772ec /crypto/pem
parent296559b0ce2d98c0e12f45994e0ebaecc650e5ca (diff)
check for error when creating PKCS#8 structure
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc)
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_pk8.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c
index b98c76c4a9..5747c7366e 100644
--- 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