diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 14:38:45 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | a5e3ac13d602173e2820e7f4399fa89e25db7821 (patch) | |
| tree | 4a0deddfa2fcf0ed1af80263654fd50f15db9dbf /include | |
| parent | f3cd81d6538e6295eaa279acd65ad10faeccd2ed (diff) | |
Deprecate CRYPTO_cleanup_all_ex_data() and make it a no-op
CRYPTO_cleanup_all_ex_data() 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/crypto.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index d775e9e0b2..d0ec86a46c 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -297,13 +297,14 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad); */ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val); void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx); + +# if OPENSSL_API_COMPAT < 0x10100000L /* * This function cleans up all "ex_data" state. It mustn't be called under * potential race-conditions. */ -void CRYPTO_cleanup_all_ex_data(void); +# define CRYPTO_cleanup_all_ex_data() -# if OPENSSL_API_COMPAT < 0x10100000L /* * The old locking functions have been removed completely without compatibility * macros. This is because the old functions either could not properly report |