Commit 7b8cc9b3 authored by Matt Caswell's avatar Matt Caswell
Browse files

Deprecate OBJ_cleanup() and make it a no-op 



OBJ_cleanup() should not be called expicitly - we should leave
auto-deinit to clean this up instead.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 22c84afa

apps/asn1pars.c

+0 −1
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ int asn1parse_main(int argc, char **argv) 
        OPENSSL_free(str);

    ASN1_TYPE_free(at);

    sk_OPENSSL_STRING_free(osk);

    OBJ_cleanup();

    return (ret);

}

apps/ca.c

+0 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,6 @@ end_of_options: 
    X509_CRL_free(crl);

    NCONF_free(conf);

    NCONF_free(extconf);

    OBJ_cleanup();

    return (ret);

}

apps/req.c

+0 −1
Original line number Diff line number Diff line
@@ -867,7 +867,6 @@ int req_main(int argc, char **argv) 
        OPENSSL_free(passin);

    if (passout != nofree_passout)

        OPENSSL_free(passout);

    OBJ_cleanup();

    return (ret);

}

apps/srp.c

+0 −1
Original line number Diff line number Diff line
@@ -653,7 +653,6 @@ int srp_main(int argc, char **argv) 
        app_RAND_write_file(randfile);

    NCONF_free(conf);

    free_index(db);

    OBJ_cleanup();

    return (ret);

}

#endif

apps/ts.c

+0 −1
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ int ts_main(int argc, char **argv) 
    app_RAND_write_file(NULL);

    NCONF_free(conf);

    OPENSSL_free(password);

    OBJ_cleanup();

    return (ret);

}