1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: fix -DOPENSSL_NO_SOCK on sunos

Browse Source 
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.
This commit is contained in:
Ben Noordhuis 2012-04-14 21:51:03 +00:00
parent 7ee15457ed
commit c945eae942
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/openssl/openssl/crypto/bio/b_sock.c vendored
View File

@ -960,7 +960,6 @@ int BIO_set_tcp_ndelay(int s, int on)
#endif #endif
return(ret == 0); return(ret == 0);
} }
#endif
int BIO_socket_nbio(int s, int mode) int BIO_socket_nbio(int s, int mode)
{ {
@ -973,3 +972,4 @@ int BIO_socket_nbio(int s, int mode)
#endif #endif
return(ret == 0); return(ret == 0);
} }
#endif

2
deps/openssl/openssl/ssl/bio_ssl.c vendored
View File

@ -538,6 +538,7 @@ err:
BIO *BIO_new_ssl_connect(SSL_CTX *ctx) BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
{ {
#ifndef OPENSSL_NO_SOCK
BIO *ret=NULL,*con=NULL,*ssl=NULL; BIO *ret=NULL,*con=NULL,*ssl=NULL;
if ((con=BIO_new(BIO_s_connect())) == NULL) if ((con=BIO_new(BIO_s_connect())) == NULL)
@ -549,6 +550,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
return(ret); return(ret);
err: err:
if (con != NULL) BIO_free(con); if (con != NULL) BIO_free(con);
#endif
return(NULL); return(NULL);
} }