diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-05-09 21:52:11 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-05-09 22:30:25 +0200 |
| commit | a20dd9f951ae7a550a069617cd65918e0cece99e (patch) | |
| tree | e487aed76ad95083ff1993d3578ef99dd151bd1c /crypto/asn1 | |
| parent | b8943a511b58828c04a68016aedd5d9e40ee6df7 (diff) | |
Add NULL check in i2d_PrivateKey()
Originally submitted by Kurt Cancemi <kurt@x64architecture.com>
Closes RT#4533
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 59a56c4cf02bbf1efeda6c2a5893d5079db78ff3)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/i2d_pr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index 4d338ac55a..12966ec536 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -69,10 +69,13 @@ int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp) } if (a->ameth && a->ameth->priv_encode) { PKCS8_PRIV_KEY_INFO *p8 = EVP_PKEY2PKCS8(a); - int ret = i2d_PKCS8_PRIV_KEY_INFO(p8, pp); - PKCS8_PRIV_KEY_INFO_free(p8); + int ret = 0; + if (p8 != NULL) { + ret = i2d_PKCS8_PRIV_KEY_INFO(p8, pp); + PKCS8_PRIV_KEY_INFO_free(p8); + } return ret; } ASN1err(ASN1_F_I2D_PRIVATEKEY, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE); - return (-1); + return -1; } |