提交 4a1fbd13 编写于 作者: A Andy Polyakov

OPENSSL_NO_SOCK fixes.

PR: 2791
Submitted by: Ben Noordhuis
上级 9eba5614
...@@ -960,7 +960,6 @@ int BIO_set_tcp_ndelay(int s, int on) ...@@ -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) ...@@ -973,3 +972,4 @@ int BIO_socket_nbio(int s, int mode)
#endif #endif
return(ret == 0); return(ret == 0);
} }
#endif
...@@ -538,6 +538,7 @@ err: ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册