Commit 4a1fbd13 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

OPENSSL_NO_SOCK fixes. 

PR: 2791
Submitted by: Ben Noordhuis
parent 9eba5614

crypto/bio/b_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -960,7 +960,6 @@ int BIO_set_tcp_ndelay(int s, int on) 
#endif

	return(ret == 0);

	}

#endif



int BIO_socket_nbio(int s, int mode)

	{
@@ -973,3 +972,4 @@ int BIO_socket_nbio(int s, int mode) 
#endif

	return(ret == 0);

	}

#endif

ssl/bio_ssl.c

+2 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ err: 


BIO *BIO_new_ssl_connect(SSL_CTX *ctx)

	{

#ifndef OPENSSL_NO_SOCK

	BIO *ret=NULL,*con=NULL,*ssl=NULL;



	if ((con=BIO_new(BIO_s_connect())) == NULL)
@@ -549,6 +550,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx) 
	return(ret);

err:

	if (con != NULL) BIO_free(con);

#endif

	return(NULL);

	}