diff options
| author | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
| commit | 2bfd7007417a2cd7c442bf1162e609303f217744 (patch) | |
| tree | 2ead8295addf0f92cbe4bf28f39105c909a6702f /crypto/openssl/crypto/asn1/ameth_lib.c | |
| parent | 95576e5070819ac5bc80e16b237dc5a0061ed9a4 (diff) | |
| download | FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.zip FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.tar.gz | |
MFC: r269682
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'crypto/openssl/crypto/asn1/ameth_lib.c')
| -rw-r--r-- | crypto/openssl/crypto/asn1/ameth_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/asn1/ameth_lib.c b/crypto/openssl/crypto/asn1/ameth_lib.c index a19e058..ef153d4 100644 --- a/crypto/openssl/crypto/asn1/ameth_lib.c +++ b/crypto/openssl/crypto/asn1/ameth_lib.c @@ -258,7 +258,12 @@ int EVP_PKEY_asn1_add_alias(int to, int from) if (!ameth) return 0; ameth->pkey_base_id = to; - return EVP_PKEY_asn1_add0(ameth); + if (!EVP_PKEY_asn1_add0(ameth)) + { + EVP_PKEY_asn1_free(ameth); + return 0; + } + return 1; } int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, |
