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 /crypto/init.c | |
parent | f3cd81d6538e6295eaa279acd65ad10faeccd2ed (diff) | |
download | openssl-a5e3ac13d602173e2820e7f4399fa89e25db7821.tar.gz |
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 'crypto/init.c')
-rw-r--r-- | crypto/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index d93f282818..3bfe4502eb 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -461,7 +461,7 @@ void OPENSSL_cleanup(void) "ENGINE_cleanup()\n"); #endif fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "CRYPTO_cleanup_all_ex_data()\n"); + "crypto_cleanup_all_ex_data_intern()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "BIO_sock_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " @@ -483,7 +483,7 @@ void OPENSSL_cleanup(void) #ifndef OPENSSL_NO_ENGINE ENGINE_cleanup(); #endif - CRYPTO_cleanup_all_ex_data(); + crypto_cleanup_all_ex_data_intern(); #ifndef OPENSSL_NO_SOCK BIO_sock_cleanup(); #endif |