generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deprecate BIO_sock_cleanup() and make it a no-op

Browse Source 
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>
This commit is contained in:
Matt Caswell
2016-04-04 14:53:37 +01:00
parent a5e3ac13d6
commit 62d876ad17
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/bio/b_sock.c
View File

@@ -205,7 +205,7 @@ int BIO_sock_init(void)
return (1); return (1);
} }
void BIO_sock_cleanup(void) void bio_sock_cleanup_intern(void)
{ {
# ifdef OPENSSL_SYS_WINDOWS # ifdef OPENSSL_SYS_WINDOWS
if (wsa_init_done) { if (wsa_init_done) {

5
crypto/init.c
View File

@@ -59,6 +59,7 @@
#include <internal/cryptlib_int.h> #include <internal/cryptlib_int.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <internal/rand.h> #include <internal/rand.h>
#include <internal/bio.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <internal/evp_int.h> #include <internal/evp_int.h>
#include <internal/conf.h> #include <internal/conf.h>
@@ -463,7 +464,7 @@ void OPENSSL_cleanup(void)
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
"crypto_cleanup_all_ex_data_intern()\n"); "crypto_cleanup_all_ex_data_intern()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
"BIO_sock_cleanup()\n"); "bio_sock_cleanup_intern()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
"EVP_cleanup()\n"); "EVP_cleanup()\n");
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
@@ -485,7 +486,7 @@ void OPENSSL_cleanup(void)
#endif #endif
crypto_cleanup_all_ex_data_intern(); crypto_cleanup_all_ex_data_intern();
#ifndef OPENSSL_NO_SOCK #ifndef OPENSSL_NO_SOCK
BIO_sock_cleanup(); bio_sock_cleanup_intern();
#endif #endif
EVP_cleanup(); EVP_cleanup();
OBJ_cleanup(); OBJ_cleanup();

3
include/internal/bio.h
View File

@@ -67,5 +67,4 @@ struct bio_method_st {
long (*callback_ctrl) (BIO *, int, bio_info_cb *); long (*callback_ctrl) (BIO *, int, bio_info_cb *);
}; };
void bio_sock_cleanup_intern(void);

4
include/openssl/bio.h
View File

@@ -695,7 +695,9 @@ int BIO_sock_error(int sock);
int BIO_socket_ioctl(int fd, long type, void *arg); int BIO_socket_ioctl(int fd, long type, void *arg);
int BIO_socket_nbio(int fd, int mode); int BIO_socket_nbio(int fd, int mode);
int BIO_sock_init(void); 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); int BIO_set_tcp_ndelay(int sock, int turn_on);
DEPRECATEDIN_1_1_0(struct hostent *BIO_gethostbyname(const char *name)) DEPRECATEDIN_1_1_0(struct hostent *BIO_gethostbyname(const char *name))