diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-06 10:53:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-06 11:06:30 -0400 |
| commit | 22e24031452d57852e83738bacfff012439f0258 (patch) | |
| tree | 633a03a4361860e91c6a095a1362e59a7f8b0aab /src/lib | |
| parent | 8815960c4615da0015e78c3256c3f611a30f6e6c (diff) | |
| download | tor-22e24031452d57852e83738bacfff012439f0258.tar.gz tor-22e24031452d57852e83738bacfff012439f0258.zip | |
Revert "Avoid double-close on TCP sockets under NSS."
This reverts commit b5fddbd24144a94580e50886cd07a82968a1b86c.
The commit here was supposed to be a solution for #27451 (fd
management with NSS), but instead it caused an assertion failure.
Fixes bug 27500; but not in any released Tor.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 560a951bc0..2a022b8531 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1042,7 +1042,7 @@ tor_tls_new(tor_socket_t sock, int isServer) goto err; } result->socket = sock; - bio = BIO_new_socket(sock, 0); + bio = BIO_new_socket(sock, BIO_NOCLOSE); if (! bio) { tls_log_errors(NULL, LOG_WARN, LD_NET, "opening BIO"); #ifdef SSL_set_tlsext_host_name |