diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 17:12:39 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 09:52:33 +0200 |
| commit | 6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743 (patch) | |
| tree | 2c67f2f0146b14025cdb73a7dae63ade6ac72df6 /crypto/init.c | |
| parent | Deprecate OBJ_cleanup() and make it a no-op (diff) | |
| download | openssl-6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743.tar.xz openssl-6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743.zip | |
Deprecate ENGINE_cleanup() and make it a no-op
ENGINE_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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/init.c b/crypto/init.c index 170d11b91c..ca19408bef 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -460,7 +460,7 @@ void OPENSSL_cleanup(void) "CONF_modules_free()\n"); #ifndef OPENSSL_NO_ENGINE fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "ENGINE_cleanup()\n"); + "engine_cleanup_intern()\n"); #endif fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "crypto_cleanup_all_ex_data_intern()\n"); @@ -474,16 +474,16 @@ void OPENSSL_cleanup(void) /* * Note that cleanup order is important: * - rand_cleanup_intern could call an ENINGE's RAND cleanup function so - * must be called before ENGINE_cleanup() + * must be called before engine_cleanup_intern() * - ENGINEs use CRYPTO_EX_DATA and therefore, must be cleaned up * before the ex data handlers are wiped in CRYPTO_cleanup_all_ex_data(). * - CONF_modules_free() can end up in ENGINE code so must be called before - * ENGINE_cleanup() + * engine_cleanup_intern() */ rand_cleanup_intern(); CONF_modules_free(); #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); + engine_cleanup_intern(); #endif crypto_cleanup_all_ex_data_intern(); #ifndef OPENSSL_NO_SOCK |