diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
| commit | 18fef7c99aa36b3e5622b3865f36d78d0879e92d (patch) | |
| tree | 7a04fc87318d5008bbc1f1ac145ebb505bb5238c /app/openssl/crypto/asn1/ameth_lib.c | |
| parent | 56fe0400b8983ce57112ed5a0f993985a87741c0 (diff) | |
| parent | 33c5958a18599267820f73b151d8161d83f93d88 (diff) | |
Merge branch 'research/Test-on-Android-5-#6543' into develop
Diffstat (limited to 'app/openssl/crypto/asn1/ameth_lib.c')
| -rw-r--r-- | app/openssl/crypto/asn1/ameth_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/openssl/crypto/asn1/ameth_lib.c b/app/openssl/crypto/asn1/ameth_lib.c index a19e058f..ef153d46 100644 --- a/app/openssl/crypto/asn1/ameth_lib.c +++ b/app/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, |