diff options
author | djm <> | 2012-10-13 21:23:50 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:50 +0000 |
commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libssl/bio_ssl.c | |
parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libssl/bio_ssl.c')
-rw-r--r-- | src/lib/libssl/bio_ssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index eedac8a3fc..e9552caee2 100644 --- a/src/lib/libssl/bio_ssl.c +++ b/src/lib/libssl/bio_ssl.c | |||
@@ -538,6 +538,7 @@ err: | |||
538 | 538 | ||
539 | BIO *BIO_new_ssl_connect(SSL_CTX *ctx) | 539 | BIO *BIO_new_ssl_connect(SSL_CTX *ctx) |
540 | { | 540 | { |
541 | #ifndef OPENSSL_NO_SOCK | ||
541 | BIO *ret=NULL,*con=NULL,*ssl=NULL; | 542 | BIO *ret=NULL,*con=NULL,*ssl=NULL; |
542 | 543 | ||
543 | if ((con=BIO_new(BIO_s_connect())) == NULL) | 544 | if ((con=BIO_new(BIO_s_connect())) == NULL) |
@@ -549,6 +550,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx) | |||
549 | return(ret); | 550 | return(ret); |
550 | err: | 551 | err: |
551 | if (con != NULL) BIO_free(con); | 552 | if (con != NULL) BIO_free(con); |
553 | #endif | ||
552 | return(NULL); | 554 | return(NULL); |
553 | } | 555 | } |
554 | 556 | ||