diff options
| author | David Benjamin <davidben@google.com> | 2017-03-21 05:27:35 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-21 11:17:19 +0100 |
| commit | b6ef12c4baa3a2c1ff0e3ac71270588dfcfe8cbd (patch) | |
| tree | 9003e8a29f7575c18caaf87f9ad48cf4f1cceea4 /crypto/x509/x509_lu.c | |
| parent | Add a test for resumption after HRR (diff) | |
| download | openssl-b6ef12c4baa3a2c1ff0e3ac71270588dfcfe8cbd.tar.xz openssl-b6ef12c4baa3a2c1ff0e3ac71270588dfcfe8cbd.zip | |
Remove duplicate X509_OBJECT free function.
These two functions do the same thing.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3001)
Diffstat (limited to 'crypto/x509/x509_lu.c')
| -rw-r--r-- | crypto/x509/x509_lu.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index d425a057ca..889fbe8282 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -172,21 +172,6 @@ err: return NULL; } -static void cleanup(X509_OBJECT *a) -{ - if (!a) - return; - if (a->type == X509_LU_X509) { - X509_free(a->data.x509); - } else if (a->type == X509_LU_CRL) { - X509_CRL_free(a->data.crl); - } else { - /* abort(); */ - } - - OPENSSL_free(a); -} - void X509_STORE_free(X509_STORE *vfy) { int i; @@ -209,7 +194,7 @@ void X509_STORE_free(X509_STORE *vfy) X509_LOOKUP_free(lu); } sk_X509_LOOKUP_free(sk); - sk_X509_OBJECT_pop_free(vfy->objs, cleanup); + sk_X509_OBJECT_pop_free(vfy->objs, X509_OBJECT_free); CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509_STORE, vfy, &vfy->ex_data); X509_VERIFY_PARAM_free(vfy->param); |