October 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 968b6c30c1158fde003a99a7d22a575e3b211c91 Merge: e0e0ef713e 40eb6b19a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:09:59 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 9587512578e1c45d62e5e97dd9222fe891c835cd Merge: 9029444482 968b6c30c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 968b6c30c1158fde003a99a7d22a575e3b211c91 Merge: e0e0ef713e 40eb6b19a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:09:59 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit c65f4eaf06c8bc1317a5fb588a81ee3c3844fcdb Merge: 8505dd5e37 9587512578 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 968b6c30c1158fde003a99a7d22a575e3b211c91 Merge: e0e0ef713e 40eb6b19a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:09:59 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 9587512578e1c45d62e5e97dd9222fe891c835cd Merge: 9029444482 968b6c30c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 9587512578e1c45d62e5e97dd9222fe891c835cd Merge: 9029444482 968b6c30c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.3.5] NSS: Tell NSS that our SSL sockets are nonblocking.
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 40eb6b19a33f1261168e5d64ba162d6f7d80e5a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 13:14:33 2020 -0400 NSS: Tell NSS that our SSL sockets are nonblocking. Closes ticket 40035. --- changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40035 b/changes/ticket40035 new file mode 100644 index 0000000000..8cdd447199 --- /dev/null +++ b/changes/ticket40035 @@ -0,0 +1,5 @@ + o Major bugfixes (NSS): + - When running with NSS enabled, make sure that NSS knows to expect + nonblocking sockets. Previously, we set our TCP sockets as blocking, + but did not tell NSS about the fact, which in turn could lead to + unexpected blocking behavior. Fixes bug 40035; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 1436442e1c..6f6c47674e 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -418,6 +418,16 @@ tor_tls_new(tor_socket_t sock, int is_server) return NULL; } + /* even if though the socket is already nonblocking, we need to tell NSS + * about the fact, so that it knows what to do when it says EAGAIN. */ + PRSocketOptionData data; + data.option = PR_SockOpt_Nonblocking; + data.value.non_blocking = 1; + if (PR_SetSocketOption(ssl, &data) != PR_SUCCESS) { + PR_Close(ssl); + return NULL; + } + tor_tls_t *tls = tor_malloc_zero(sizeof(tor_tls_t)); tls->magic = TOR_TLS_MAGIC; tls->context = ctx;

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 6a54a6b351e3aaeaea31d7700312d05c7a8325c5 Merge: eeb00bb292 c65f4eaf06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 968b6c30c1158fde003a99a7d22a575e3b211c91 Merge: e0e0ef713e 40eb6b19a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 7 08:09:59 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5 changes/ticket40035 | 5 +++++ src/lib/tls/tortls_nss.c | 10 ++++++++++ 2 files changed, 15 insertions(+)

1 0