diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-04-14 21:51:03 +0000 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-04-14 22:05:17 +0000 |
| commit | c945eae9421c94590bd8736e903551fac8a0c885 (patch) | |
| tree | aebc7a91aaa08f24ab079e075ff560f2332186dd /deps | |
| parent | 7ee15457edbd634c85b69fb3b865c4e27b17b672 (diff) | |
| download | node-new-c945eae9421c94590bd8736e903551fac8a0c885.tar.gz | |
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.
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/openssl/openssl/crypto/bio/b_sock.c | 2 | ||||
| -rw-r--r-- | deps/openssl/openssl/ssl/bio_ssl.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/bio/b_sock.c b/deps/openssl/openssl/crypto/bio/b_sock.c index d47310d650..41f958be71 100644 --- a/deps/openssl/openssl/crypto/bio/b_sock.c +++ b/deps/openssl/openssl/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/deps/openssl/openssl/ssl/bio_ssl.c b/deps/openssl/openssl/ssl/bio_ssl.c index eedac8a3fc..e9552caee2 100644 --- a/deps/openssl/openssl/ssl/bio_ssl.c +++ b/deps/openssl/openssl/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); } |