diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-27 19:51:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 19:51:04 +0200 |
| commit | 1525071c28535816b98784f2ad62f9d5ef333654 (patch) | |
| tree | 3502be2b2ae57c73fa21bd7b4a20dc02aab3aa06 /thirdparty/openssl/crypto/asn1/i2d_pr.c | |
| parent | ce8bf1592abfb0e9382d437fc453d0ffd500e076 (diff) | |
| parent | 67305d1b0a6dbcdb032d5a5a0e92122cf8f10b8d (diff) | |
Merge pull request #8960 from akien-mga/openssl-1.0.2l
OpenSSL: Cleanup and document update process from upstream sources + 1.0.2l
Diffstat (limited to 'thirdparty/openssl/crypto/asn1/i2d_pr.c')
| -rw-r--r-- | thirdparty/openssl/crypto/asn1/i2d_pr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/thirdparty/openssl/crypto/asn1/i2d_pr.c b/thirdparty/openssl/crypto/asn1/i2d_pr.c index 4d338ac55a..12966ec536 100644 --- a/thirdparty/openssl/crypto/asn1/i2d_pr.c +++ b/thirdparty/openssl/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; } |