diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-28 15:44:20 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-28 18:03:04 +0100 |
| commit | f16093d2d6a61ae8b14e4b337b3c33e1900791f1 (patch) | |
| tree | 91a5440400a0b84db44508d2d8ac1dc574fd4e01 | |
| parent | aeff907218415cb8e36822cf9ded1e45489b6ea3 (diff) | |
| download | openssl-f16093d2d6a61ae8b14e4b337b3c33e1900791f1.tar.gz | |
check for error when creating PKCS#8 structure
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc)
| -rw-r--r-- | crypto/pem/pem_pk8.c | 2 |
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 |