diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:15:53 -0500 |
| commit | 8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch) | |
| tree | b617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/crypto/asn1/ameth_lib.c | |
| parent | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff) | |
| download | vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2 vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.zip | |
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/crypto/asn1/ameth_lib.c')
| -rw-r--r-- | openssl/crypto/asn1/ameth_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl/crypto/asn1/ameth_lib.c b/openssl/crypto/asn1/ameth_lib.c index a19e058fc..ef153d461 100644 --- a/openssl/crypto/asn1/ameth_lib.c +++ b/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, |