[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b6ef12c4baa3a2c1ff0e3ac71270588dfcfe8cbd (commit)
      from  1763ab10291eec361d8e56519582d710158e1e8e (commit)


- Log -----------------------------------------------------------------
commit b6ef12c4baa3a2c1ff0e3ac71270588dfcfe8cbd
Author: David Benjamin <davidben at google.com>
Date:   Tue Mar 21 00:27:35 2017 -0400

    Remove duplicate X509_OBJECT free function.
    
    These two functions do the same thing.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3001)

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x509_lu.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index d425a05..889fbe8 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);