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

[tor/master] Include protocol version lines in votes.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 84f913024d9ad87f676793367b54e6f95be05eda Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 11:58:33 2016 -0400 Include protocol version lines in votes. --- src/or/dirserv.c | 15 +++++++++++++++ src/or/dirvote.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ff50ca4..a4eb738 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2908,6 +2908,21 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, v3_out->client_versions = client_versions; v3_out->server_versions = server_versions; + + /* These are hardwired to avoid disaster. */ + v3_out->recommended_relay_protocols = + tor_strdup("DirCache=1 HSDir=1 Desc=1-2 Cons=1-2 Microdesc=1-2 " + "HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2"); + v3_out->recommended_client_protocols = + tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " + "HSMid=1 Link=4 LinkAuth=1 Relay=2"); + v3_out->required_relay_protocols = + tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " + "HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2"); + v3_out->required_client_protocols = + tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " + "HSMid=1 Link=1 LinkAuth=1 Relay=2"); + v3_out->package_lines = smartlist_new(); { config_line_t *cl; diff --git a/src/or/dirvote.c b/src/or/dirvote.c index aec13a9..e1d0d84 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -75,6 +75,44 @@ format_line_if_present(const char *keyword, const char *opt_value) } } +/** Format the recommended/required-relay-client protocols lines for a vote in + * a newly allocated string, and return that string. */ +static char * +format_protocols_lines_for_vote(const networkstatus_t *v3_ns) +{ + char *recommended_relay_protocols_line = NULL; + char *recommended_client_protocols_line = NULL; + char *required_relay_protocols_line = NULL; + char *required_client_protocols_line = NULL; + + recommended_relay_protocols_line = + format_line_if_present("recommended-relay-protocols", + v3_ns->recommended_relay_protocols); + recommended_client_protocols_line = + format_line_if_present("recommended-client-protocols", + v3_ns->recommended_client_protocols); + required_relay_protocols_line = + format_line_if_present("required-relay-protocols", + v3_ns->required_relay_protocols); + required_client_protocols_line = + format_line_if_present("required-client-protocols", + v3_ns->required_client_protocols); + + char *result = NULL; + tor_asprintf(&result, "%s%s%s%s", + recommended_relay_protocols_line, + recommended_client_protocols_line, + required_relay_protocols_line, + required_client_protocols_line); + + tor_free(recommended_relay_protocols_line); + tor_free(recommended_client_protocols_line); + tor_free(required_relay_protocols_line); + tor_free(required_client_protocols_line); + + return result; +} + /** Return a new string containing the string representation of the vote in * <b>v3_ns</b>, signed with our v3 signing key <b>private_signing_key</b>. * For v3 authorities. */ @@ -87,6 +125,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, char fingerprint[FINGERPRINT_LEN+1]; char digest[DIGEST_LEN]; uint32_t addr; + char *protocols_lines = NULL; char *client_versions_line = NULL, *server_versions_line = NULL; char *shared_random_vote_str = NULL; networkstatus_voter_info_t *voter; @@ -106,6 +145,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, v3_ns->client_versions); server_versions_line = format_line_if_present("server-versions", v3_ns->server_versions); + protocols_lines = format_protocols_lines_for_vote(v3_ns); if (v3_ns->package_lines) { smartlist_t *tmp = smartlist_new(); @@ -157,6 +197,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "valid-until %s\n" "voting-delay %d %d\n" "%s%s" /* versions */ + "%s" /* protocols */ "%s" /* packages */ "known-flags %s\n" "flag-thresholds %s\n" @@ -170,6 +211,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, v3_ns->vote_seconds, v3_ns->dist_seconds, client_versions_line, server_versions_line, + protocols_lines, packages, flags, flag_thresholds, @@ -261,6 +303,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, done: tor_free(client_versions_line); tor_free(server_versions_line); + tor_free(protocols_lines); tor_free(packages); SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp));

1 0

[tor/master] Update prop264 implementation to split HSMid->HS{Intro, Rend}
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 4cbfee14d40221a25545d2d2c3d6e6ce76f6afe9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 14 10:31:56 2016 -0400 Update prop264 implementation to split HSMid->HS{Intro,Rend} --- src/or/dirserv.c | 16 ++++++++-------- src/or/protover.c | 17 +++++++++++++---- src/or/protover.h | 3 ++- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 99b2e8a..d3bc615 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2922,17 +2922,17 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " - "LinkAuth=1 Microdesc=1-2 Relay=2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " + "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->recommended_client_protocols = - tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " - "LinkAuth=1 Microdesc=1-2 Relay=2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " + "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->required_client_protocols = - tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " - "LinkAuth=1 Microdesc=1-2 Relay=2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " + "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->required_relay_protocols = - tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=3-4 " - "LinkAuth=1 Microdesc=1 Relay=1-2"); + tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " + "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2"); v3_out->package_lines = smartlist_new(); { diff --git a/src/or/protover.c b/src/or/protover.c index a2471b0..74fc3d0 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -17,9 +17,10 @@ static const struct { { PRT_LINK, "Link" }, { PRT_LINKAUTH, "LinkAuth" }, { PRT_RELAY, "Relay" }, - { PRT_HSMID, "HSMid" }, { PRT_DIRCACHE, "DirCache" }, { PRT_HSDIR, "HSDir" }, + { PRT_HSINTRO, "HSIntro" }, + { PRT_HSREND, "HSRend" }, { PRT_DESC, "Desc" }, { PRT_MICRODESC, "Microdesc"}, { PRT_CONS, "Cons" } @@ -267,7 +268,8 @@ protover_get_supported_protocols(void) "Desc=1-2 " "DirCache=1 " "HSDir=1 " - "HSMid=1 " + "HSIntro=3 " + "HSRend=1-2 " "Link=1-4 " "LinkAuth=1 " "Microdesc=1-2 " @@ -674,15 +676,22 @@ protover_compute_for_old_tor(const char *version) FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS)) { return ""; } else if (tor_version_as_new_as(version, "0.2.7.5")) { + /* 0.2.9.1-alpha HSRend=2 */ + return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1-2 " + "Link=1-4 LinkAuth=1 " + "Microdesc=1-2 Relay=1-2"; + } else if (tor_version_as_new_as(version, "0.2.7.5")) { /* 0.2.7-stable added Desc=2, Microdesc=2, Cons=2, which indicate * ed25519 support. We'll call them present only in "stable" 027, * though. */ - return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=1-4 LinkAuth=1 " + return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " + "Link=1-4 LinkAuth=1 " "Microdesc=1-2 Relay=1-2"; } else if (tor_version_as_new_as(version, "0.2.4.19")) { /* No currently supported Tor server versions are older than this, or * lack these protocols. */ - return "Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=1-4 LinkAuth=1 " + return "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " + "Link=1-4 LinkAuth=1 " "Microdesc=1 Relay=1-2"; } else { /* Cannot infer protocols. */ diff --git a/src/or/protover.h b/src/or/protover.h index 5f4789d..075405e 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -15,9 +15,10 @@ typedef enum protocol_type_t { PRT_LINK, PRT_LINKAUTH, PRT_RELAY, - PRT_HSMID, PRT_DIRCACHE, PRT_HSDIR, + PRT_HSINTRO, + PRT_HSREND, PRT_DESC, PRT_MICRODESC, PRT_CONS,

1 0

[tor/master] Rename "proto " to "pr " in consensuses
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit f3382bd7223a3e5c0e6f1c32dc7d9e8a2d28fb36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 10:14:39 2016 -0400 Rename "proto " to "pr " in consensuses --- src/or/dirserv.c | 2 +- src/or/dirvote.c | 2 +- src/or/routerparse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d3bc615..d7a707d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1861,7 +1861,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, smartlist_add_asprintf(chunks, "v %s\n", version); } if (protocols) { - smartlist_add_asprintf(chunks, "proto %s\n", protocols); + smartlist_add_asprintf(chunks, "pr %s\n", protocols); } if (format != NS_V2) { diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c65243c..9b41e8f 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2047,7 +2047,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add(chunks, tor_strdup("\n")); if (chosen_protocol_list && consensus_method >= MIN_METHOD_FOR_RS_PROTOCOLS) { - smartlist_add_asprintf(chunks, "proto %s\n", chosen_protocol_list); + smartlist_add_asprintf(chunks, "pr %s\n", chosen_protocol_list); } /* Now the weight line. */ if (rs_out.has_bandwidth) { diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 459a939..aecf6a2 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -389,7 +389,7 @@ static token_rule_t rtrstatus_token_table[] = { T01("w", K_W, ARGS, NO_OBJ ), T0N("m", K_M, CONCAT_ARGS, NO_OBJ ), T0N("id", K_ID, GE(2), NO_OBJ ), - T01("proto", K_PROTO, CONCAT_ARGS, NO_OBJ ), + T01("pr", K_PROTO, CONCAT_ARGS, NO_OBJ ), T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), END_OF_TABLE };

1 0

[tor/master] Remove version_known, and subtly change the meaning of protocols_known
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 1ab641a70e1f2cc2548abfd03e62e3f8b04825d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 10:21:13 2016 -0400 Remove version_known, and subtly change the meaning of protocols_known --- src/or/networkstatus.c | 5 +++-- src/or/or.h | 8 ++------ src/or/routerlist.c | 5 +++-- src/or/routerparse.c | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3299a2c..f113777 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1456,8 +1456,9 @@ routerstatus_has_changed(const routerstatus_t *a, const routerstatus_t *b) a->is_valid != b->is_valid || a->is_possible_guard != b->is_possible_guard || a->is_bad_exit != b->is_bad_exit || - a->is_hs_dir != b->is_hs_dir || - a->version_known != b->version_known; + a->is_hs_dir != b->is_hs_dir; + // XXXX this function needs a huge refactoring; it has gotten out + // XXXX of sync with routerstatus_t, and it will do so again. } /** Notify controllers of any router status entries that changed between diff --git a/src/or/or.h b/src/or/or.h index befbf71..7c7163f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2193,12 +2193,8 @@ typedef struct routerstatus_t { unsigned int is_v2_dir:1; /** True iff this router publishes an open DirPort * or it claims to accept tunnelled dir requests. */ - /** True iff we know version info for this router. (i.e., a "v" entry was - * included.) We'll replace all these with a big tor_version_t or a char[] - * if the number of traits we care about ever becomes incredibly big. */ - unsigned int version_known:1; - - /** True iff we have a proto line for this router.*/ + /** True iff we have a proto line for this router, or a versions line + * from which we could infer the protocols. */ unsigned int protocols_known:1; /** True iff this router has a version or protocol list that allows it to diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0a03f13..0e637f4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5526,7 +5526,8 @@ routerinfo_has_curve25519_onion_key(const routerinfo_t *ri) } /* Is rs running a tor version known to support ntor? - * If allow_unknown_versions is true, return true if the version is unknown. + * If allow_unknown_versions is true, return true if we can't tell + * (from a versions line or a protocols line) whether it supports ntor. * Otherwise, return false if the version is unknown. */ int routerstatus_version_supports_ntor(const routerstatus_t *rs, @@ -5536,7 +5537,7 @@ routerstatus_version_supports_ntor(const routerstatus_t *rs, return allow_unknown_versions; } - if (!rs->version_known && !rs->protocols_known) { + if (!rs->protocols_known) { return allow_unknown_versions; } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index aecf6a2..d5690c1 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2914,13 +2914,13 @@ routerstatus_parse_entry_from_string(memarea_t *area, } if ((tok = find_opt_by_keyword(tokens, K_V))) { tor_assert(tok->n_args == 1); - rs->version_known = 1; if (!strcmpstart(tok->args[0], "Tor ") && !found_protocol_list) { /* We only do version checks like this in the case where * the version is a "Tor" version, and where there is no * list of protocol versions that we should be looking at instead. */ rs->supports_extend2_cells = tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); + rs->protocols_known = 1; } if (vote_rs) { vote_rs->version = tor_strdup(tok->args[0]);

1 0

[tor/master] protovers: during voting, assert that we are not voting to shut down.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 501fc3bbc6e6e4003c99b0bfd95deb06b2df9580 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 10:25:02 2016 -0400 protovers: during voting, assert that we are not voting to shut down. As a failsafe, we should make sure that no authority ever votes for a set of protocol versions that it does not itself support. --- src/or/dirserv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d7a707d..e8d60d0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2934,6 +2934,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2"); + /* We are not allowed to vote to require anything we don't have. */ + tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL)); + tor_assert(protover_all_supported(v3_out->required_client_protocols, NULL)); + + /* We should not recommend anything we don't have. */ + tor_assert_nonfatal(protover_all_supported( + v3_out->recommended_relay_protocols, NULL)); + tor_assert_nonfatal(protover_all_supported( + v3_out->recommended_client_protocols, NULL)); + v3_out->package_lines = smartlist_new(); { config_line_t *cl;

1 0

[tor/master] fix a warning in protover.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 153ff4f559d9b7eeb70d7ebd15225f347cc0aae6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 26 11:03:31 2016 -0700 fix a warning in protover. --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 74fc3d0..9e0391a 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -343,7 +343,7 @@ encode_protocol_list(const smartlist_t *sl) /* We treat any protocol list with more than this many subprotocols in it * as a DoS attempt. */ -const int MAX_PROTOCOLS_TO_EXPAND = (1<<16); +static const int MAX_PROTOCOLS_TO_EXPAND = (1<<16); /** Voting helper: Given a list of proto_entry_t, return a newly allocated * smartlist of newly allocated strings, one for each included protocol

1 0

[tor/master] Merge branch 'protover_v2_squashed'
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 97337844b7282946dda12f59bcabc097fad42647 Merge: a633baf 501fc3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 26 11:00:08 2016 -0700 Merge branch 'protover_v2_squashed' changes/prop264 | 18 ++ src/or/dirserv.c | 36 +++ src/or/dirserv.h | 4 +- src/or/dirvote.c | 181 ++++++++++-- src/or/dirvote.h | 10 +- src/or/include.am | 2 + src/or/main.c | 2 + src/or/networkstatus.c | 142 +++++++++- src/or/or.h | 28 +- src/or/protover.c | 712 +++++++++++++++++++++++++++++++++++++++++++++++ src/or/protover.h | 67 +++++ src/or/router.c | 13 +- src/or/routerlist.c | 8 +- src/or/routerparse.c | 59 +++- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_dir.c | 2 - src/test/test_protover.c | 195 +++++++++++++ 19 files changed, 1443 insertions(+), 39 deletions(-) diff --cc src/or/dirvote.c index ae869c9,9b41e8f..8b195f8 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@@ -1580,9 -1706,10 +1706,10 @@@ networkstatus_compute_consensus(smartli routerstatus_t rs_out; const char *current_rsa_id = NULL; const char *chosen_version; + const char *chosen_protocol_list; const char *chosen_name = NULL; int exitsummary_disagreement = 0; - int is_named = 0, is_unnamed = 0, is_running = 0; + int is_named = 0, is_unnamed = 0, is_running = 0, is_valid = 0; int is_guard = 0, is_exit = 0, is_bad_exit = 0; int naming_conflict = 0; int n_listing = 0; diff --cc src/or/dirvote.h index 06bfe67,a6c847e..efd233e --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@@ -55,7 -55,7 +55,7 @@@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ --#define MAX_SUPPORTED_CONSENSUS_METHOD 24 ++#define MAX_SUPPORTED_CONSENSUS_METHOD 25 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@@ -99,10 -99,14 +99,18 @@@ * value(s). */ #define MIN_METHOD_FOR_SHARED_RANDOM 23 +/** Lowest consensus method where authorities drop all nodes that don't get + * the Valid flag. */ +#define MIN_METHOD_FOR_EXCLUDING_INVALID_NODES 24 + + /** Lowest consensus method where authorities vote on required/recommended + * protocols. */ -#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 24 ++#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 25 + + /** Lowest consensus method where authorities add protocols to routerstatus + * entries. */ -#define MIN_METHOD_FOR_RS_PROTOCOLS 24 ++#define MIN_METHOD_FOR_RS_PROTOCOLS 25 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */

1 0

[tor/master] Merge remote-tracking branch 'public/ticket20001_v2'
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit ed5d2daba1944d7910b991475763376162b31af9 Merge: 9733784 8fdf2f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 26 11:01:10 2016 -0700 Merge remote-tracking branch 'public/ticket20001_v2' changes/ticket20001 | 6 ++++++ src/or/routerparse.c | 9 ++++++++- src/or/routerparse.h | 8 ++++++++ src/test/test_dir.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --cc src/or/routerparse.c index d5690c1,b1d9a85..db3d004 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@@ -2904,23 -2876,20 +2905,29 @@@ routerstatus_parse_entry_from_string(me rs->is_v2_dir = 1; } } + /* These are implied true by having been included in a consensus made + * with a given method */ + rs->is_flagged_running = 1; /* Starting with consensus method 4. */ + if (consensus_method >= MIN_METHOD_FOR_EXCLUDING_INVALID_NODES) + rs->is_valid = 1; + } + int found_protocol_list = 0; + if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { + found_protocol_list = 1; + rs->protocols_known = 1; + rs->supports_extend2_cells = + protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2); + } if ((tok = find_opt_by_keyword(tokens, K_V))) { tor_assert(tok->n_args == 1); - rs->version_known = 1; - if (strcmpstart(tok->args[0], "Tor ")) { - } else { - rs->version_supports_extend2_cells = + if (!strcmpstart(tok->args[0], "Tor ") && !found_protocol_list) { + /* We only do version checks like this in the case where + * the version is a "Tor" version, and where there is no + * list of protocol versions that we should be looking at instead. */ + rs->supports_extend2_cells = tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); + rs->protocols_known = 1; } if (vote_rs) { vote_rs->version = tor_strdup(tok->args[0]);

1 0

[torspec/master] Tag 264 and 272 as "finished". (Not closed; spec merge still needed)
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 39dbb69a11b3706a89ffdd517fc4392f700e4cc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 26 11:01:53 2016 -0700 Tag 264 and 272 as "finished". (Not closed; spec merge still needed) --- proposals/000-index.txt | 8 ++++---- proposals/264-subprotocol-versions.txt | 3 ++- proposals/272-valid-and-running-by-default.txt | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index d0376cd..cf2102d 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -184,7 +184,7 @@ Proposals by number: 261 AEZ for relay cryptography [OPEN] 262 Re-keying live circuits with new cryptographic material [OPEN] 263 Request to change key exchange protocol for handshake v1.2 [OBSOLETE] -264 Putting version numbers on the Tor subprotocols [OPEN] +264 Putting version numbers on the Tor subprotocols [FINISHED] 265 Load Balancing with Overhead Parameters [ACCEPTED] 266 Removing current obsolete clients from the Tor network [DRAFT] 267 Tor Consensus Transparency [DRAFT] @@ -192,7 +192,7 @@ Proposals by number: 269 Transitionally secure hybrid handshakes [DRAFT] 270 RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope [DRAFT] 271 Another algorithm for guard selection [OPEN] -272 Listed routers should be Valid, Running, and treated as such [OPEN] +272 Listed routers should be Valid, Running, and treated as such [FINISHED] Proposals by status: @@ -250,9 +250,7 @@ Proposals by status: 256 Key revocation for relays and authorities 261 AEZ for relay cryptography 262 Re-keying live circuits with new cryptographic material - 264 Putting version numbers on the Tor subprotocols 271 Another algorithm for guard selection - 272 Listed routers should be Valid, Running, and treated as such ACCEPTED: 140 Provide diffs between consensuses 172 GETINFO controller option for circuit information @@ -281,6 +279,8 @@ Proposals by status: 217 Tor Extended ORPort Authentication [for 0.2.5.x] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 235 Stop assigning (and eventually supporting) the Named flag [in 0.2.6, 0.2.7] + 264 Putting version numbers on the Tor subprotocols [in 0.2.9.4-alpha] + 272 Listed routers should be Valid, Running, and treated as such [in 0.2.9.3-alpha, 0.2.9.4-alpha] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x] diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt index 4acc8b3..5375d82 100644 --- a/proposals/264-subprotocol-versions.txt +++ b/proposals/264-subprotocol-versions.txt @@ -2,7 +2,8 @@ Filename: 264-subprotocol-versions.txt Title: Putting version numbers on the Tor subprotocols Author: Nick Mathewson Created: 6 Jan 2016 -Status: Open +Status: Finished +Implemented-In: 0.2.9.4-alpha 1. Introduction diff --git a/proposals/272-valid-and-running-by-default.txt b/proposals/272-valid-and-running-by-default.txt index 7e14b6b..473d92b 100644 --- a/proposals/272-valid-and-running-by-default.txt +++ b/proposals/272-valid-and-running-by-default.txt @@ -2,7 +2,8 @@ Filename: 272-valid-and-running-by-default.txt Title: Listed routers should be Valid, Running, and treated as such Created: 26 Aug 2016 Author: Nick Mathewson -Status: Open +Status: Finished +Implemented-In: 0.2.9.3-alpha, 0.2.9.4-alpha 1. Introduction and proposal.

1 0

[tor-browser-bundle/hardened-builds] Bumping OpenSSL for nightlies again
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 5f850eb9ff3334a75efe83904ecd307798b41ad3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 12:13:22 2016 +0000 Bumping OpenSSL for nightlies again --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d99711c..1d598d4 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -52,7 +52,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2i +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -107,7 +107,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0