diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 14:53:37 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | 62d876ad1784bce2feb1b95cfff8aca0fbc3e1e2 (patch) | |
| tree | 18db51c88bbdf8774ec6d6e19fe414cba212bc78 /crypto | |
| parent | a5e3ac13d602173e2820e7f4399fa89e25db7821 (diff) | |
Deprecate BIO_sock_cleanup() and make it a no-op
BIO_sock_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')
| -rw-r--r-- | crypto/bio/b_sock.c | 2 | ||||
| -rw-r--r-- | crypto/init.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 046de99190..e0038f0188 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -205,7 +205,7 @@ int BIO_sock_init(void) return (1); } -void BIO_sock_cleanup(void) +void bio_sock_cleanup_intern(void) { # ifdef OPENSSL_SYS_WINDOWS if (wsa_init_done) { diff --git a/crypto/init.c b/crypto/init.c index 3bfe4502eb..2d50d4deb8 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -59,6 +59,7 @@ #include <internal/cryptlib_int.h> #include <openssl/err.h> #include <internal/rand.h> +#include <internal/bio.h> #include <openssl/evp.h> #include <internal/evp_int.h> #include <internal/conf.h> @@ -463,7 +464,7 @@ void OPENSSL_cleanup(void) fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "crypto_cleanup_all_ex_data_intern()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "BIO_sock_cleanup()\n"); + "bio_sock_cleanup_intern()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "EVP_cleanup()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " @@ -485,7 +486,7 @@ void OPENSSL_cleanup(void) #endif crypto_cleanup_all_ex_data_intern(); #ifndef OPENSSL_NO_SOCK - BIO_sock_cleanup(); + bio_sock_cleanup_intern(); #endif EVP_cleanup(); OBJ_cleanup(); |