Commit 62d876ad authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent a5e3ac13

crypto/bio/b_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

crypto/init.c

+3 −2
Original line number Diff line number Diff line
@@ -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();

include/internal/bio.h

+1 −2
Original line number Diff line number Diff line
@@ -67,5 +67,4 @@ struct bio_method_st { 
    long (*callback_ctrl) (BIO *, int, bio_info_cb *);

};





void bio_sock_cleanup_intern(void);

include/openssl/bio.h

+3 −1
Original line number Diff line number Diff line
@@ -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))