From e4ece40404217e984f713d2106236c97961a8b22 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 14 Apr 2012 21:51:03 +0000 Subject: [PATCH] fix -DOPENSSL_NO_SOCK on sunos The OPENSSL_NO_SOCK macro in OpenSSL missed a couple of networking functions that called other functions that OPENSSL_NO_SOCK *had* filtered out. Even if none of the functions were actually used, it was still enough to trip up the linker on Solaris. --- crypto/bio/b_sock.c | 2 +- ssl/bio_ssl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index d47310d..41f958b 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 eedac8a..e9552ca 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); } -- 1.7.3.4