May 2017 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'argonblue/bug22177'
by nickm＠torproject.org 11 May '17

11 May '17

commit dc9274dec3ded209124002e90b9b028cbb953d56 Merge: 38003f4 3156392 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 11 07:41:21 2017 -0400 Merge remote-tracking branch 'argonblue/bug22177' src/test/test_options.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Test config line parsing errors
by nickm＠torproject.org 11 May '17

11 May '17

commit 3156392e9bec5f5df350bbfd992f2269007a7abb Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed May 10 16:45:04 2017 -0400 Test config line parsing errors Add tests for lower-level syntax errors in config file lines. Fixes #22177. --- src/test/test_options.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index f8acc2e..ad735b7 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -186,7 +186,8 @@ test_options_validate_impl(const char *configuration, expect_log, msg)) goto done; } - tt_int_op((r == 0), OP_EQ, (msg == NULL)); + if (r) + goto done; r = config_assign(&options_format, opt, cl, 0, &msg); if (phase == PH_ASSIGN) { @@ -261,6 +262,13 @@ test_options_validate(void *arg) OK("HeartbeatPeriod 1 hour", PH_VALIDATE); OK("LogTimeGranularity 100 milliseconds", PH_VALIDATE); + WANT_LOG("ControlSocket \"string with trailing garbage\" bogus", LOG_WARN, + "Error while parsing configuration: " + "Excess data after quoted string", PH_GETLINES); + WANT_LOG("ControlSocket \"bogus escape \\@\"", LOG_WARN, + "Error while parsing configuration: " + "Invalid escape sequence in quoted string", PH_GETLINES); + close_temp_logs(); clear_log_messages(); return;

1 0

[torspec/master] prop224: Change how descriptor encode encryption keys
by nickm＠torproject.org 11 May '17

11 May '17

commit 3f9333044e77759996083d0d9dd2c8053358d895 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Apr 6 08:29:20 2017 -0400 prop224: Change how descriptor encode encryption keys Every intro point, legacy or not, needs a ntor encryption key. However, in the case of a legacy introductin point, we need an extra RSA key so the IP can relay the INTRODUCE1 cell on the right circuit. We now only need the cross certificate for the encryption key because the signing-key extention make sure we have the actual key encoded in that certificate. The legacy key cross certificate doesn't support that extention so we need both the RSA key and the crosscert. Fixes #21871 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 2d6f261..56ca69c 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1219,39 +1219,49 @@ Table of contents: is included in the mandatory signing-key extension. The certificate type must be [09]. - Encryption key is specified as follow: + "enc-key" SP "ntor" SP key NL - [Exactly once enc-key per introduction point] - - "enc-key" SP "ntor" SP key NL - - The key is a base64 encoded curve25519 public key used to encrypt - the introduction request to service. - - "enc-key" SP "legacy" NL key NL + [Exactly once per introduction point] - Base64 encoded RSA key, wrapped in "----BEGIN RSA PUBLIC - KEY-----" armor, for use with a legacy introduction point as - described in [LEGACY_EST_INTRO] and [LEGACY-INTRODUCE1] below. + The key is a base64 encoded curve25519 public key used to encrypt + the introduction request to service. - "enc-key-certification" NL certificate NL + "enc-key-cert" NL certificate NL [Exactly once per introduction point] - Cross-certification of the descriptor signing key by the enc-key. - The format of this certificate depends on the type of enc-key. + Cross-certification of the descriptor signing key by the encryption + key. For "ntor" keys, certificate is a proposal 220 certificate wrapped in "-----BEGIN ED25519 CERT-----" armor, cross-certifying the - descriptor signing key with the ed25519 equivalent of the curve25519 - public key from "enc-key" derived using the process in proposal 228 - appendix A. The certificate type must be [10], and the signing-key + descriptor signing key with the ed25519 equivalent of a curve25519 + public encryption key derived using the process in proposal 228 + appendix A. The certificate type must be [0B], and the signing-key extension is mandatory. - For "legacy" keys, certificate is a proposal 220 RSA->Ed - cross-certificate wrapped in "-----BEGIN CROSSCERT-----" armor, - cross-certifying the descriptor signing key with the legacy RSA - encryption key. + "legacy-key" NL key NL + + [None or at most once per introduction point] + + The key is an ASN.1 encoded RSA public key in PEM format used for a + legacy introduction point as described in [LEGACY_EST_INTRO] and + [LEGACY-INTRODUCE1] below. + + This field is only present if the introduction point only supports + legacy protocol (v2) that is <= 0.2.9 or the protocol version value + "HSIntro 3". + + "legacy-key-cert NL certificate NL + + [None or at most once per introduction point] + + MUST be present if "legacy-key" is present. + + The certificate is a proposal 220 RSA->Ed cross-certificate wrapped + in "-----BEGIN CROSSCERT-----" armor, cross-certifying the + descriptor signing key with the RSA public key found in + "legacy-key". To remain compatible with future revisions to the descriptor format, clients should ignore unrecognized lines in the descriptor.

1 0

[torspec/master] Merge remote-tracking branch 'dgoulet/ticket21871_01'
by nickm＠torproject.org 11 May '17

11 May '17

commit 422ca3d2edace750993a45c41ece03bdb00ec6c3 Merge: 28ed266 3f93330 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 11 07:30:47 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket21871_01' proposals/224-rend-spec-ng.txt | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-)

1 0

[tor/master] Resurrect dead code in test_channelpadding.c
by nickm＠torproject.org 11 May '17

11 May '17

commit 2bf4263800f4ee14e2e4cd4015b2b6c46c25c845 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed May 10 13:57:18 2017 -0400 Resurrect dead code in test_channelpadding.c A for-loop in test_channelpadding_timers() would never run because it was trying to increment a counter up to CHANNELS_TO_TEST/3 after an earlier block already incremented it to CHANNELS_TO_TEST/2. Fixes #22221, CID 1405983. --- src/test/test_channelpadding.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index ae6abe4..0a70184 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -287,22 +287,22 @@ test_channelpadding_timers(void *arg) tt_int_op(tried_to_write_cell, OP_EQ, 0); } - /* This loop should add timers to our existing lists in a weak - * pseudorandom pattern. It ensures that the lists can grow with multiple - * timers in them. */ - for (; i < CHANNELS_TO_TEST/2; i++) { - chans[i]->next_padding_time_ms = monotime_coarse_absolute_msec() + 10 + - i*3 % CHANNELPADDING_MAX_TIMERS; + /* This loop should add timers to the first position in the timerslot + * array, since its timeout is before all other timers. */ + for (; i < CHANNELS_TO_TEST/3; i++) { + chans[i]->next_padding_time_ms = monotime_coarse_absolute_msec() + 1; decision = channelpadding_decide_to_pad_channel(chans[i]); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); tt_assert(chans[i]->pending_padding_callback); tt_int_op(tried_to_write_cell, OP_EQ, 0); } - /* This loop should add timers to the first position in the timerslot - * array, since its timeout is before all other timers. */ - for (; i < CHANNELS_TO_TEST/3; i++) { - chans[i]->next_padding_time_ms = monotime_coarse_absolute_msec() + 1; + /* This loop should add timers to our existing lists in a weak + * pseudorandom pattern. It ensures that the lists can grow with multiple + * timers in them. */ + for (; i < CHANNELS_TO_TEST/2; i++) { + chans[i]->next_padding_time_ms = monotime_coarse_absolute_msec() + 10 + + i*3 % CHANNELPADDING_MAX_TIMERS; decision = channelpadding_decide_to_pad_channel(chans[i]); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SCHEDULED); tt_assert(chans[i]->pending_padding_callback);

1 0

[tor/master] Merge remote-tracking branch 'argonblue/bug22221'
by nickm＠torproject.org 11 May '17

11 May '17

commit 38003f43503dede563e01e8ddc08be8999b35815 Merge: 466e27f 2bf4263 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 11 07:25:22 2017 -0400 Merge remote-tracking branch 'argonblue/bug22221' src/test/test_channelpadding.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[chutney/master] Fix a shell variable increment that was accidentally executed
by teor＠torproject.org 11 May '17

11 May '17

commit ee777176704017f2fb4f0cdb2d9d2217909dd817 Author: teor <teor2345(a)gmail.com> Date: Thu May 11 16:20:22 2017 +1000 Fix a shell variable increment that was accidentally executed --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index bb09591..d77003b 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -303,7 +303,7 @@ if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then -a "$VERIFY_EXIT_STATUS" -eq 0 ]; do "$CHUTNEY" verify "$CHUTNEY_NETWORK" VERIFY_EXIT_STATUS="$?" - $[n_rounds++] + n_rounds=$[n_rounds+1] done $ECHO "Completed $n_rounds of $CHUTNEY_ROUNDS verify rounds." else

1 0

[chutney/master] Add an option for test-network.sh to run multiple verify rounds
by teor＠torproject.org 11 May '17

11 May '17

commit f020fb9f0d92866b7b4d6a2a10e6af966f23164d Author: teor <teor2345(a)gmail.com> Date: Thu May 11 11:26:34 2017 +1000 Add an option for test-network.sh to run multiple verify rounds This option can be used via --rounds or CHUTNEY_ROUNDS. The default is 1. Also clarify that connections are opened simultaneously. Implements #22225. --- README | 7 ++++++- tools/test-network.sh | 25 +++++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/README b/README index 7779e84..14d521a 100644 --- a/README +++ b/README @@ -43,7 +43,9 @@ Timing Options: Traffic Options: --data CHUTNEY_DATA_BYTES=N + # connections are simultaneous, rounds are sequential --connections CHUTNEY_CONNECTIONS=N + --rounds CHUTNEY_ROUNDS=N --hs-multi-client CHUTNEY_HS_MULTI_CLIENT=N Address Options: @@ -91,10 +93,13 @@ Connection Tests: ./chutney configure networks/basic-025 ./chutney start networks/basic-025 ./chutney status networks/basic-025 + # Make 5 simultaneous connections from each client through a random exit CHUTNEY_CONNECTIONS=5 ./chutney verify networks/basic-025 - # Make 5 connections from each client through a random exit ./chutney stop networks/basic-025 + # Run 5 sequential verification rounds + CHUTNEY_ROUNDS=5 ./tools/test-network.sh --flavour basic + Note: If you create 7 or more connections to a hidden service from a single Tor 0.2.7 client, you'll likely get a verification failure due to #15937. This is fixed in 0.2.8. diff --git a/tools/test-network.sh b/tools/test-network.sh index 59681c4..bb09591 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -5,6 +5,9 @@ export ECHO="${ECHO:-echo}" # Output is prefixed with the name of the script myname=$(basename "$0") +# default to one round +export CHUTNEY_ROUNDS=${CHUTNEY_ROUNDS:-1} + # default to summarising unexpected warnings export CHUTNEY_WARNINGS_IGNORE_EXPECTED=${CHUTNEY_WARNINGS_IGNORE_EXPECTED:-true} export CHUTNEY_WARNINGS_SUMMARY=${CHUTNEY_WARNINGS_SUMMARY:-true} @@ -78,7 +81,7 @@ do export CHUTNEY_DATA_BYTES="$2" shift ;; - # Make this many connections per client (1) + # Make this many simultaneous connections per client (1) # Note: If you create 7 or more connections to a hidden service from # a single Tor 0.2.7 client, you'll likely get a verification failure due # to #15937. This is fixed in 0.2.8. @@ -86,6 +89,11 @@ do export CHUTNEY_CONNECTIONS="$2" shift ;; + # Run this many verification rounds (1) + --rounds) + export CHUTNEY_ROUNDS="$2" + shift + ;; # Make each client connect to each HS (0) # 0 means a single client connects to each HS # 1 means every client connects to every HS @@ -286,9 +294,18 @@ else fi if [ "$CHUTNEY_BOOTSTRAP_TIME" -ge 0 ]; then - # Chutney will try to verify for $CHUTNEY_BOOTSTRAP_TIME seconds - "$CHUTNEY" verify "$CHUTNEY_NETWORK" - VERIFY_EXIT_STATUS="$?" + # Chutney will try to verify for $CHUTNEY_BOOTSTRAP_TIME seconds each round + n_rounds=0 + VERIFY_EXIT_STATUS=0 + # Run CHUTNEY_ROUNDS verification rounds + $ECHO "Running $CHUTNEY_ROUNDS verify rounds..." + while [ "$CHUTNEY_ROUNDS" -gt "$n_rounds" \ + -a "$VERIFY_EXIT_STATUS" -eq 0 ]; do + "$CHUTNEY" verify "$CHUTNEY_NETWORK" + VERIFY_EXIT_STATUS="$?" + $[n_rounds++] + done + $ECHO "Completed $n_rounds of $CHUTNEY_ROUNDS verify rounds." else $ECHO "Chutney network ready and running. To stop the network, use:" $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK"

1 0

[webwml/master] tshirt page update from kat
by arma＠torproject.org 10 May '17

10 May '17

commit 72b5cb667a88932183111421d24771d95a247ae3 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 19:17:40 2017 -0400 tshirt page update from kat resolves ticket 22222 --- getinvolved/en/tshirt.wml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 7d6336c..c893fb0 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -39,11 +39,9 @@ </p> <p> - The nice people at torservers.net - are handling the tshirt requests. They have <a - href="https://www.torservers.net/wiki/ttshirt/index">a variety of - colors, shapes, and sizes</a>, using the great new "roots" design - that Leiah Jansen made for us. + There are a <a href="<wiki>org/teams/CommunityTeam/Tshirts">variety + of colors, shapes, and sizes</a> available in the great roots design + that Leiah Jansen made for us, as well as some older designs. </p> <div style="text-align: center">

1 0

[tor/master] simplify functions now that they don't use options param
by arma＠torproject.org 10 May '17

10 May '17

commit 466e27feaebf0bb7a1c906b733a0da2328b21330 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:57:35 2017 -0400 simplify functions now that they don't use options param --- src/or/networkstatus.c | 4 +--- src/or/networkstatus.h | 3 +-- src/or/nodelist.c | 15 +++++++-------- src/or/routerlist.c | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index aef17be..bd106fd 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2469,10 +2469,8 @@ networkstatus_parse_flavor_name(const char *flavname) * running, or otherwise not a descriptor that we would make any * use of even if we had it. Else return 1. */ int -client_would_use_router(const routerstatus_t *rs, time_t now, - const or_options_t *options) +client_would_use_router(const routerstatus_t *rs, time_t now) { - (void) options; /* unused */ if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. * (Fetching and storing depends on by we_want_to_fetch_flavor().) */ diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 7d148b4..37a5a3b 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -76,8 +76,7 @@ int should_delay_dir_fetches(const or_options_t *options,const char **msg_out); void update_networkstatus_downloads(time_t now); void update_certificate_downloads(time_t now); int consensus_is_waiting_for_certs(void); -int client_would_use_router(const routerstatus_t *rs, time_t now, - const or_options_t *options); +int client_would_use_router(const routerstatus_t *rs, time_t now); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void)); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, (consensus_flavor_t f)); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index dc4d9a6..e24261b 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -74,7 +74,6 @@ static void count_usable_descriptors(int *num_present, int *num_usable, smartlist_t *descs_out, const networkstatus_t *consensus, - const or_options_t *options, time_t now, routerset_t *in_set, usable_descriptor_t exit_only); @@ -1690,7 +1689,7 @@ static void count_usable_descriptors(int *num_present, int *num_usable, smartlist_t *descs_out, const networkstatus_t *consensus, - const or_options_t *options, time_t now, + time_t now, routerset_t *in_set, usable_descriptor_t exit_only) { @@ -1707,7 +1706,7 @@ count_usable_descriptors(int *num_present, int *num_usable, continue; if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1)) continue; - if (client_would_use_router(rs, now, options)) { + if (client_would_use_router(rs, now)) { const char * const digest = rs->descriptor_digest; int present; ++*num_usable; /* the consensus says we want it. */ @@ -1761,10 +1760,10 @@ compute_frac_paths_available(const networkstatus_t *consensus, const int authdir = authdir_mode_v3(options); count_usable_descriptors(num_present_out, num_usable_out, - mid, consensus, options, now, NULL, + mid, consensus, now, NULL, USABLE_DESCRIPTOR_ALL); if (options->EntryNodes) { - count_usable_descriptors(&np, &nu, guards, consensus, options, now, + count_usable_descriptors(&np, &nu, guards, consensus, now, options->EntryNodes, USABLE_DESCRIPTOR_ALL); } else { SMARTLIST_FOREACH(mid, const node_t *, node, { @@ -1785,7 +1784,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, * an unavoidable feature of forcing authorities to declare * certain nodes as exits. */ - count_usable_descriptors(&np, &nu, exits, consensus, options, now, + count_usable_descriptors(&np, &nu, exits, consensus, now, NULL, USABLE_DESCRIPTOR_EXIT_ONLY); log_debug(LD_NET, "%s: %d present, %d usable", @@ -1834,7 +1833,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, smartlist_t *myexits_unflagged = smartlist_new(); /* All nodes with exit flag in ExitNodes option */ - count_usable_descriptors(&np, &nu, myexits, consensus, options, now, + count_usable_descriptors(&np, &nu, myexits, consensus, now, options->ExitNodes, USABLE_DESCRIPTOR_EXIT_ONLY); log_debug(LD_NET, "%s: %d present, %d usable", @@ -1845,7 +1844,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, /* Now compute the nodes in the ExitNodes option where which we don't know * what their exit policy is, or we know it permits something. */ count_usable_descriptors(&np, &nu, myexits_unflagged, - consensus, options, now, + consensus, now, options->ExitNodes, USABLE_DESCRIPTOR_ALL); log_debug(LD_NET, "%s: %d present, %d usable", diff --git a/src/or/routerlist.c b/src/or/routerlist.c index cba0d92..a790265 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5142,7 +5142,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, continue; /* We would throw it out immediately. */ } if (!we_want_to_fetch_flavor(options, consensus->flavor) && - !client_would_use_router(rs, now, options)) { + !client_would_use_router(rs, now)) { ++n_wouldnt_use; continue; /* We would never use it ourself. */ }

1 0