generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OPENSSL_NO_SOCK fixes [from HEAD].

Browse Source 
PR: 2791
Submitted by: Ben Noordhuis
This commit is contained in:
Andy Polyakov 2012-04-16 17:43:02 +00:00
parent 94c666479d
commit f6a1939f0f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/bio/b_sock.c
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
ssl/bio_ssl.c
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);
} }