diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 15:49:21 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | 7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8 (patch) | |
| tree | da9131b97fb33b3ae50e5d79665a8bdef5eee16c /apps | |
| parent | 22c84afa773559279af928652a2d9f3489cc7d73 (diff) | |
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: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/asn1pars.c | 1 | ||||
| -rw-r--r-- | apps/ca.c | 1 | ||||
| -rw-r--r-- | apps/req.c | 1 | ||||
| -rw-r--r-- | apps/srp.c | 1 | ||||
| -rw-r--r-- | apps/ts.c | 1 | ||||
| -rw-r--r-- | apps/x509.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/apps/asn1pars.c b/apps/asn1pars.c index a6cc6397fa..3da7e3b4c5 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -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); } @@ -1307,7 +1307,6 @@ end_of_options: X509_CRL_free(crl); NCONF_free(conf); NCONF_free(extconf); - OBJ_cleanup(); return (ret); } diff --git a/apps/req.c b/apps/req.c index e3869bab19..7f4a946aaa 100644 --- a/apps/req.c +++ b/apps/req.c @@ -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); } diff --git a/apps/srp.c b/apps/srp.c index 2c4d746f88..1bf2ee299a 100644 --- a/apps/srp.c +++ b/apps/srp.c @@ -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 @@ -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); } diff --git a/apps/x509.c b/apps/x509.c index 6ee26115ee..d8be179d43 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -919,7 +919,6 @@ int x509_main(int argc, char **argv) end: if (need_rand) app_RAND_write_file(NULL); - OBJ_cleanup(); NCONF_free(extconf); BIO_free_all(out); X509_STORE_free(ctx); |