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 d47310d650c57ec71cb892eaab38216eea6ebbc2..41f958be710668032d9789a2226e696566d92e18 100644 (file)
--- 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 eedac8a3fcfccef8aae1ef4831868e00a18d515f..e9552caee2aa997cb882f0a82376a7527f9a7c15 100644 (file)
--- 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);
        }