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 /include | |
| 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 'include')
| -rw-r--r-- | include/openssl/engine.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/openssl/engine.h b/include/openssl/engine.h index c12e02755f..86a42933c5 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -406,8 +406,7 @@ void ENGINE_set_table_flags(unsigned int flags); * ENGINE_register_***(e) - registers the implementation from 'e' (if it has one) * ENGINE_unregister_***(e) - unregister the implementation from 'e' * ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list - * Cleanup is automatically registered from each table when required, so - * ENGINE_cleanup() will reverse any "register" operations. + * Cleanup is automatically registered from each table when required. */ int ENGINE_register_RSA(ENGINE *e); @@ -549,13 +548,13 @@ int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns); int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg); void *ENGINE_get_ex_data(const ENGINE *e, int idx); +#if OPENSSL_API_COMPAT < 0x10100000L /* - * This function cleans up anything that needs it. Eg. the ENGINE_add() - * function automatically ensures the list cleanup function is registered to - * be called from ENGINE_cleanup(). Similarly, all ENGINE_register_*** - * functions ensure ENGINE_cleanup() will clean up after them. + * This function previously cleaned up anything that needs it. Auto-deinit will + * now take care of it so it is no longer required to call this function. */ -void ENGINE_cleanup(void); +# define ENGINE_cleanup() +#endif /* * These return values from within the ENGINE structure. These can be useful |