diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-12-30 04:16:49 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-12-30 04:16:49 +0000 |
commit | 52932d6f1a72b9cd3a0bd9571016fa763662d3d6 (patch) | |
tree | 29b3db3881b4bfb2bde2f1e79c6d9848088aaf5f /src/common/tortls.c | |
parent | ffe22fab9b81f4b0dea35bc2fb756d4a60cf3ed3 (diff) | |
download | tor-52932d6f1a72b9cd3a0bd9571016fa763662d3d6.tar.gz tor-52932d6f1a72b9cd3a0bd9571016fa763662d3d6.zip |
Remove some code that is #ifdefed out, and that we no longer seem to use, if we ever did.
svn:r17827
Diffstat (limited to 'src/common/tortls.c')
-rw-r--r-- | src/common/tortls.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 0d9a5defe0..20c1d06761 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -199,7 +199,7 @@ tls_log_errors(tor_tls_t *tls, int severity, const char *doing) static int tor_errno_to_tls_error(int e) { -#if defined(MS_WINDOWS) && !defined(USE_BSOCKETS) +#if defined(MS_WINDOWS) switch (e) { case WSAECONNRESET: // most common return TOR_TLS_ERROR_CONNRESET; @@ -839,11 +839,7 @@ tor_tls_new(int sock, int isServer) if (!isServer) rectify_client_ciphers(&result->ssl->cipher_list); result->socket = sock; -#ifdef USE_BSOCKETS - bio = BIO_new_bsocket(sock, BIO_NOCLOSE); -#else bio = BIO_new_socket(sock, BIO_NOCLOSE); -#endif if (! bio) { tls_log_errors(NULL, LOG_WARN, "opening BIO"); SSL_free(result->ssl); |