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 /crypto/init.c | |
| parent | 22c84afa773559279af928652a2d9f3489cc7d73 (diff) | |
| download | openssl-7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8.tar.gz | |
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 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index dc24c02693..170d11b91c 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -67,6 +67,7 @@ #include <internal/engine.h> #include <internal/comp.h> #include <internal/err.h> +#include <internal/objects.h> #include <stdlib.h> #include <assert.h> @@ -468,7 +469,7 @@ void OPENSSL_cleanup(void) fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "evp_cleanup_intern()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "OBJ_cleanup()\n"); + "obj_cleanup_intern()\n"); #endif /* * Note that cleanup order is important: @@ -489,7 +490,7 @@ void OPENSSL_cleanup(void) bio_sock_cleanup_intern(); #endif evp_cleanup_intern(); - OBJ_cleanup(); + obj_cleanup_intern(); base_inited = 0; } |