From 62d876ad1784bce2feb1b95cfff8aca0fbc3e1e2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 4 Apr 2016 14:53:37 +0100 Subject: 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 Reviewed-by: Richard Levitte --- include/internal/bio.h | 3 +-- include/openssl/bio.h | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/internal/bio.h b/include/internal/bio.h index b3352ce80f..bf5bc18c7a 100644 --- a/include/internal/bio.h +++ b/include/internal/bio.h @@ -67,5 +67,4 @@ struct bio_method_st { long (*callback_ctrl) (BIO *, int, bio_info_cb *); }; - - +void bio_sock_cleanup_intern(void); diff --git a/include/openssl/bio.h b/include/openssl/bio.h index e0c6380883..97a3d9d46c 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -695,7 +695,9 @@ int BIO_sock_error(int sock); int BIO_socket_ioctl(int fd, long type, void *arg); int BIO_socket_nbio(int fd, int mode); int BIO_sock_init(void); -void BIO_sock_cleanup(void); +#if OPENSSL_API_COMPAT < 0x10100000L +# define BIO_sock_cleanup() +#endif int BIO_set_tcp_ndelay(int sock, int turn_on); DEPRECATEDIN_1_1_0(struct hostent *BIO_gethostbyname(const char *name)) -- cgit v1.2.3