Refactor socket closing in tor_tls_free() so it is not broken with NSS
tor_tls_free() closes the socket in openssl, but not in nss. This is asking for trouble.
Activity
changed milestone to %Tor: 0.3.5.x-final in legacy/trac
added 035-roadmap-master in Legacy / Trac 035-triaged-in-20180711 in Legacy / Trac component::core tor/tor in Legacy / Trac milestone::Tor: 0.3.5.x-final in Legacy / Trac owner::nickm in Legacy / Trac parent::26631 in Legacy / Trac priority::medium in Legacy / Trac resolution::fixed in Legacy / Trac severity::normal in Legacy / Trac status::closed in Legacy / Trac type::defect in Legacy / Trac labels
My first attempt at addressing this was in b5fddbd2, but that caused bug legacy/trac#27500 (moved), and had to be reverted with 22e24031.
I see two possible solutions here:
- Find some way to make NSS follow OpenSSL's behavior, and let us free the connection without closing the fd.
- Have OpenSSL follow NSS's behavior (which will be easy) -- and adjust our connection code to tolerate that behavior. (This is what I tried to do before).
-
I have a patch here as
nss_27451, with PR at https://github.com/torproject/tor/pull/322 .It takes a hybrid approach: by default, the TLS connection object owns the socket and closes it when it's freed. But if something else needs to free the socket, ownership is wrested from the TLS connection object.
The unit tests pass for me, but chutney+nss is failing because of legacy/trac#27664 (moved).
Trac:
Status: assigned to needs_review mentioned in issue legacy/trac#27500 (moved)
mentioned in issue legacy/trac#27664 (moved)
moved from legacy/trac#27451 (moved)
added Bug label and removed 1 deleted label
