September 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Make bridges send AUTH_CHALLENGE cells
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit cbc53a2d52a67e49e56ad9d8f5334ad623a59374 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 10:10:35 2013 -0400 Make bridges send AUTH_CHALLENGE cells The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to them because of the other part of bug 9546. Fixes bug 9546; bugfix on 0.2.3.6-alpha. --- changes/bug9546 | 8 +++++++- src/or/channeltls.c | 4 ++-- src/or/connection_or.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug9546 b/changes/bug9546 index 8596eac..2145e35 100644 --- a/changes/bug9546 +++ b/changes/bug9546 @@ -2,4 +2,10 @@ - When a relay is extending a circuit to a bridge, it needs to send a NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE - cell. Fixes bug 9546; bugfix on ????. + cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha. + + - Bridges send AUTH_CHALLENGE cells during their handshakes; previously + they did not, which prevented relays from successfully connecting + to a bridge for self-test or bandwidth testing. Fixes bug 9546; + bugfix on 0.2.3.6-alpha. + diff --git a/src/or/channeltls.c b/src/or/channeltls.c index a7953e7..f751c0d 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1262,8 +1262,8 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) const int send_versions = !started_here; /* If we want to authenticate, send a CERTS cell */ const int send_certs = !started_here || public_server_mode(get_options()); - /* If we're a relay that got a connection, ask for authentication. */ - const int send_chall = !started_here && public_server_mode(get_options()); + /* If we're a host that got a connection, ask for authentication. */ + const int send_chall = !started_here; /* If our certs cell will authenticate us, we can send a netinfo cell * right now. */ const int send_netinfo = !started_here; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 31cc9c7..d5dd447 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2218,7 +2218,7 @@ connection_or_compute_authenticate_cell_body(or_connection_t *conn, const tor_cert_t *id_cert=NULL, *link_cert=NULL; const digests_t *my_digests, *their_digests; const uint8_t *my_id, *their_id, *client_id, *server_id; - if (tor_tls_get_my_certs(0, &link_cert, &id_cert)) + if (tor_tls_get_my_certs(server, &link_cert, &id_cert)) return -1; my_digests = tor_cert_get_id_digests(id_cert); their_digests = tor_cert_get_id_digests(conn->handshake_state->id_cert);

1 0

[tor/release-0.2.4] Add a 30-day maximum on user-supplied MaxCircuitDirtiness
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit af7970b6bcc8e546cf15e943f1bec749cce18eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 11:35:00 2013 -0400 Add a 30-day maximum on user-supplied MaxCircuitDirtiness Fix for bug 9543. --- changes/bug9543 | 4 ++++ src/or/config.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug9543 b/changes/bug9543 new file mode 100644 index 0000000..753947f --- /dev/null +++ b/changes/bug9543 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid overflows when the user sets MaxCircuitDirtiness to a + ridiculously high value, by imposing a (ridiculously high) 30-day + maximum on MaxCircuitDirtiness. diff --git a/src/or/config.c b/src/or/config.c index 72ceea3..793fd55 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2266,6 +2266,10 @@ compute_publishserverdescriptor(or_options_t *options) * will generate too many circuits and potentially overload the network. */ #define MIN_MAX_CIRCUIT_DIRTINESS 10 +/** Highest allowable value for MaxCircuitDirtiness: prevents time_t + * overflows. */ +#define MAX_MAX_CIRCUIT_DIRTINESS (30*24*60*60) + /** Lowest allowable value for CircuitStreamTimeout; if this is too low, Tor * will generate too many circuits and potentially overload the network. */ #define MIN_CIRCUIT_STREAM_TIMEOUT 10 @@ -2786,6 +2790,12 @@ options_validate(or_options_t *old_options, or_options_t *options, options->MaxCircuitDirtiness = MIN_MAX_CIRCUIT_DIRTINESS; } + if (options->MaxCircuitDirtiness > MAX_MAX_CIRCUIT_DIRTINESS) { + log_warn(LD_CONFIG, "MaxCircuitDirtiness option is too high; " + "setting to %d days.", MAX_MAX_CIRCUIT_DIRTINESS/86400); + options->MaxCircuitDirtiness = MAX_MAX_CIRCUIT_DIRTINESS; + } + if (options->CircuitStreamTimeout && options->CircuitStreamTimeout < MIN_CIRCUIT_STREAM_TIMEOUT) { log_warn(LD_CONFIG, "CircuitStreamTimeout option is too short; "

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 43f187ec2e40517148c11f8eaa915ec2ae6d1ec4 Merge: edaea77 8bf2892 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 20:47:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9564' into maint-0.2.3
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 8bf2892f51eb15dcba2a174968efa3cb12d5b6b6 Merge: 64410cc 2530c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 20:46:40 2013 -0400 Merge remote-tracking branch 'public/bug9564' into maint-0.2.3 changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9543' into maint-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 3727a978b8ca5015c1d684a0151002cd70ab3426 Merge: 43f187e af7970b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 25 00:29:06 2013 -0400 Merge remote-tracking branch 'public/bug9543' into maint-0.2.4 changes/bug9543 | 4 ++++ src/or/config.c | 10 ++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9366' into maint-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 1ee1c8fb4fc2e4855dba4387a58162656b5b9f0f Merge: 3727a97 b9f9110 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 25 00:29:49 2013 -0400 Merge remote-tracking branch 'public/bug9366' into maint-0.2.4 changes/bug9366 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 8611195a005ed1624bdea0632404a8c00bb19586 Merge: 8bf2892 940cef3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 25 00:32:27 2013 -0400 Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3 changes/bug9546 | 11 +++++++++++ src/or/command.c | 14 ++++++++++++-- src/or/connection_or.c | 9 ++++++++- src/or/or.h | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit a5610cfa64189db693dbad3efaa973d6720c42fe Merge: 4107ddd 8611195 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 25 00:33:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 (Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just merged our own into 0.2.4)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 4107ddd003c6c0f1271ad73a40114350f600dbec Merge: 1ee1c8f cbc53a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 25 00:31:51 2013 -0400 Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4 changes/bug9546 | 11 +++++++++++ src/or/channeltls.c | 14 ++++++++++++-- src/or/connection_or.c | 9 ++++++++- src/or/or.h | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit a1963695cada32e3728f44ad585a7453ec7ffe3b Merge: 00ca2cc a5610cf Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 31 20:10:58 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9366 | 4 + changes/bug9543 | 4 + changes/bug9546 | 11 + changes/bug9564 | 5 + changes/doc-heartbeat-loglevel | 3 + changes/geoip-august2013 | 3 + doc/tor.1.txt | 2 +- src/config/geoip | 9207 ++++++++++++++++++++-------------------- src/or/channeltls.c | 14 +- src/or/config.c | 17 + src/or/connection_or.c | 9 +- src/or/networkstatus.c | 2 +- src/or/or.h | 3 + 13 files changed, 4590 insertions(+), 4694 deletions(-)

1 0