Commit b6ef12c4 authored by David Benjamin's avatar David Benjamin Committed by Matt Caswell
Browse files

Remove duplicate X509_OBJECT free function. 



These two functions do the same thing.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3001)
parent 1763ab10

crypto/x509/x509_lu.c

+1 −16
Original line number Diff line number Diff line
@@ -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);