This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

deps: 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. None of
the functions (filtered or not) were actually used but it was enough to trip
up the Solaris linker.
  • Loading branch information...
bnoordhuis committed Apr 14, 2012
1 parent 7ee1545 commit c945eae9421c94590bd8736e903551fac8a0c885
Showing with 3 additions and 1 deletion.
  1. +1 −1 deps/openssl/openssl/crypto/bio/b_sock.c
  2. +2 −0 deps/openssl/openssl/ssl/bio_ssl.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
@@ -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);
}

0 comments on commit c945eae

Please sign in to comment.