OPENSSL_NO_SOCK fixes.

Andy Polyakov · Andy Polyakov · commit 4a1fbd13ee2a · 2012-04-16T17:42:36.000Z
PR: 2791
Submitted by: Ben Noordhuis
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
@@ -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
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
@@ -538,6 +538,7 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
 
 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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,6 @@ int BIO_set_tcp_ndelay(int s, int on)`
`960`	`960`	`#endif`
`961`	`961`	`return(ret == 0);`
`962`	`962`	`}`
`963`		`-#endif`
`964`	`963`
`965`	`964`	`int BIO_socket_nbio(int s, int mode)`
`966`	`965`	`{`
`@@ -973,3 +972,4 @@ int BIO_socket_nbio(int s, int mode)`
`973`	`972`	`#endif`
`974`	`973`	`return(ret == 0);`
`975`	`974`	`}`
	`975`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,7 @@ BIO BIO_new_buffer_ssl_connect(SSL_CTX ctx)`
`538`	`538`
`539`	`539`	`BIO BIO_new_ssl_connect(SSL_CTX ctx)`
`540`	`540`	`{`
	`541`	`+#ifndef OPENSSL_NO_SOCK`
`541`	`542`	`BIO ret=NULL,con=NULL,*ssl=NULL;`
`542`	`543`
`543`	`544`	`if ((con=BIO_new(BIO_s_connect())) == NULL)`
`@@ -549,6 +550,7 @@ BIO BIO_new_ssl_connect(SSL_CTX ctx)`
`549`	`550`	`return(ret);`
`550`	`551`	`err:`
`551`	`552`	`if (con != NULL) BIO_free(con);`
	`553`	`+#endif`
`552`	`554`	`return(NULL);`
`553`	`555`	`}`
`554`	`556`