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:29:13 +0200 |
| commit | 59a56c4cf02bbf1efeda6c2a5893d5079db78ff3 (patch) | |
| tree | f829d6d9af985690cc6fb6aa7eaa8556fb87a1b0 | |
| parent | Don't send signature algorithms when client_version is below TLS 1.2. (diff) | |
| download | openssl-59a56c4cf02bbf1efeda6c2a5893d5079db78ff3.tar.xz openssl-59a56c4cf02bbf1efeda6c2a5893d5079db78ff3.zip | |
Add NULL check in i2d_PrivateKey()
Originally submitted by Kurt Cancemi <kurt@x64architecture.com>
Closes RT#4533
Reviewed-by: Matt Caswell <matt@openssl.org>
| -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 7ca643fb58..15b428eec1 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; } |