diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 16:12:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | 6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743 (patch) | |
| tree | 2c67f2f0146b14025cdb73a7dae63ade6ac72df6 /crypto/engine | |
| parent | 7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8 (diff) | |
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/engine')
| -rw-r--r-- | crypto/engine/eng_int.h | 6 | ||||
| -rw-r--r-- | crypto/engine/eng_lib.c | 6 | ||||
| -rw-r--r-- | crypto/engine/eng_list.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index f6a54d8567..70b9517b7e 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -99,9 +99,9 @@ extern CRYPTO_RWLOCK *global_engine_lock; /* * Any code that will need cleanup operations should use these functions to - * register callbacks. ENGINE_cleanup() will call all registered callbacks in - * order. NB: both the "add" functions assume the engine lock to already be - * held (in "write" mode). + * register callbacks. engine_cleanup_intern() will call all registered + * callbacks in order. NB: both the "add" functions assume the engine lock to + * already be held (in "write" mode). */ typedef void (ENGINE_CLEANUP_CB) (void); typedef struct st_engine_cleanup_item { diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c index dd4734202e..492a249361 100644 --- a/crypto/engine/eng_lib.c +++ b/crypto/engine/eng_lib.c @@ -148,8 +148,8 @@ int ENGINE_free(ENGINE *e) /* Cleanup stuff */ /* - * ENGINE_cleanup() is coded such that anything that does work that will need - * cleanup can register a "cleanup" callback here. That way we don't get + * engine_cleanup_intern() is coded such that anything that does work that will + * need cleanup can register a "cleanup" callback here. That way we don't get * linker bloat by referring to all *possible* cleanups, but any linker bloat * into code "X" will cause X's cleanup function to end up here. */ @@ -200,7 +200,7 @@ static void engine_cleanup_cb_free(ENGINE_CLEANUP_ITEM *item) OPENSSL_free(item); } -void ENGINE_cleanup(void) +void engine_cleanup_intern(void) { if (int_cleanup_check(0)) { sk_ENGINE_CLEANUP_ITEM_pop_free(cleanup_stack, diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index 4883d14fff..26c6a6b077 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -79,7 +79,7 @@ static ENGINE *engine_list_tail = NULL; /* * This cleanup function is only needed internally. If it should be called, - * we register it with the "ENGINE_cleanup()" stack to be called during + * we register it with the "engine_cleanup_intern()" stack to be called during * cleanup. */ |