diff options
| author |   jsing <jsing@openbsd.org> | 2014-05-02 17:05:41 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-05-02 17:05:41 +0000 |
| commit | 640e48e745e125bb63038bf3a9da5e271f23a6e4 (patch) | |
| tree | 4925d0cf42d28159b29ec32237162317ed19196f /lib/libssl/src/ssl | |
| parent | Sort and group includes. We also do not need to include openssl/evp.h more (diff) | |
| download | wireguard-openbsd-640e48e745e125bb63038bf3a9da5e271f23a6e4.tar.xz wireguard-openbsd-640e48e745e125bb63038bf3a9da5e271f23a6e4.zip | |
Nuke OPENSSL_NO_SOCK since any half sane operating system has sockets.
ok beck@
Diffstat (limited to 'lib/libssl/src/ssl')
| -rw-r--r-- | lib/libssl/src/ssl/bio_ssl.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl.h | 2 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/lib/libssl/src/ssl/bio_ssl.c b/lib/libssl/src/ssl/bio_ssl.c index 4c5c5ac3de9..96ba1ad09c0 100644 --- a/lib/libssl/src/ssl/bio_ssl.c +++ b/lib/libssl/src/ssl/bio_ssl.c @@ -509,7 +509,6 @@ ssl_puts(BIO *bp, const char *str) BIO * BIO_new_buffer_ssl_connect(SSL_CTX *ctx) { -#ifndef OPENSSL_NO_SOCK BIO *ret = NULL, *buf = NULL, *ssl = NULL; if ((buf = BIO_new(BIO_f_buffer())) == NULL) @@ -524,14 +523,12 @@ err: BIO_free(buf); if (ssl != NULL) BIO_free(ssl); -#endif return (NULL); } 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) @@ -544,7 +541,6 @@ BIO_new_ssl_connect(SSL_CTX *ctx) err: if (con != NULL) BIO_free(con); -#endif return (NULL); } diff --git a/lib/libssl/src/ssl/ssl.h b/lib/libssl/src/ssl/ssl.h index 2325996f656..0e117dbca47 100644 --- a/lib/libssl/src/ssl/ssl.h +++ b/lib/libssl/src/ssl/ssl.h @@ -1657,11 +1657,9 @@ const char * SSL_get_cipher_list(const SSL *s, int n); char * SSL_get_shared_ciphers(const SSL *s, char *buf, int len); int SSL_get_read_ahead(const SSL * s); int SSL_pending(const SSL *s); -#ifndef OPENSSL_NO_SOCK int SSL_set_fd(SSL *s, int fd); int SSL_set_rfd(SSL *s, int fd); int SSL_set_wfd(SSL *s, int fd); -#endif #ifndef OPENSSL_NO_BIO void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio); BIO * SSL_get_rbio(const SSL *s); diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index 21a48da182a..195271a554f 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -660,7 +660,6 @@ SSL_get_wfd(const SSL *s) return (ret); } -#ifndef OPENSSL_NO_SOCK int SSL_set_fd(SSL *s, int fd) { @@ -728,7 +727,6 @@ SSL_set_rfd(SSL *s, int fd) err: return (ret); } -#endif /* return length of latest Finished message we sent, copy to 'buf' */ |