From: Andy Polyakov <appro@openssl.org>
Date: Mon, 16 Apr 2012 17:43:15 +0000 (+0000)
Subject: OPENSSL_NO_SOCK fixes [from HEAD].
X-Git-Tag: OpenSSL_1_0_1a~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=32e12316e52a6161dd32ec5d7155e9769e1a0c83;p=oweals%2Fopenssl.git

OPENSSL_NO_SOCK fixes [from HEAD].
PR: 2791
Submitted by: Ben Noordhuis
---

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index d47310d650..41f958be71 100644
--- 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
index eedac8a3fc..e9552caee2 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -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);
 	}