April 2018 - tor-commits - lists.torproject.org

[tor/master] Helper function to add u32 without overflow.
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 0e06a9c3e76620881db95718f60441ce7de0f3c9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 2 07:12:15 2018 +0000 Helper function to add u32 without overflow. --- src/common/util.c | 13 +++++++++++++ src/common/util.h | 2 ++ src/test/test_util.c | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 041e7aee3..b14b6f397 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -572,6 +572,19 @@ add_laplace_noise(int64_t signal_, double random_, double delta_f, return signal_ + noise; } +/* Helper: safely add two uint32_t's, capping at UINT32_MAX rather + * than overflow */ +uint32_t +tor_add_u32_nowrap(uint32_t a, uint32_t b) +{ + /* a+b > UINT32_MAX check, without overflow */ + if (PREDICT_UNLIKELY(a > UINT32_MAX - b)) { + return UINT32_MAX; + } else { + return a+b; + } +} + /* Helper: return greatest common divisor of a,b */ static uint64_t gcd64(uint64_t a, uint64_t b) diff --git a/src/common/util.h b/src/common/util.h index ae27e5f01..c0d20e1b2 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -176,6 +176,8 @@ int n_bits_set_u8(uint8_t v); int64_t clamp_double_to_int64(double number); void simplify_fraction64(uint64_t *numer, uint64_t *denom); +uint32_t tor_add_u32_nowrap(uint32_t a, uint32_t b); + /* Compute the CEIL of a divided by b, for nonnegative a * and positive b. Works on integer types only. Not defined if a+(b-1) * can overflow. */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 24b43c899..350273bf4 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6050,6 +6050,23 @@ test_util_monotonic_time_add_msec(void *arg) } static void +test_util_nowrap_math(void *arg) +{ + (void)arg; + + tt_u64_op(0, OP_EQ, tor_add_u32_nowrap(0, 0)); + tt_u64_op(1, OP_EQ, tor_add_u32_nowrap(0, 1)); + tt_u64_op(1, OP_EQ, tor_add_u32_nowrap(1, 0)); + tt_u64_op(4, OP_EQ, tor_add_u32_nowrap(2, 2)); + tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(UINT32_MAX-1, 2)); + tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(2, UINT32_MAX-1)); + tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(UINT32_MAX, UINT32_MAX)); + + done: + ; +} + +static void test_util_htonll(void *arg) { (void)arg; @@ -6243,6 +6260,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(listdir, 0), UTIL_TEST(parent_dir, 0), UTIL_TEST(ftruncate, 0), + UTIL_TEST(nowrap_math, 0), UTIL_TEST(num_cpus, 0), UTIL_TEST_WIN_ONLY(load_win_lib, 0), UTIL_TEST_NO_WIN(exit_status, 0),

1 0

[tor/master] Use u32 add helper for CIRC_BW accounting.
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit f921fd771ae51a82d971be064edca86b11f6004b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 2 07:16:19 2018 +0000 Use u32 add helper for CIRC_BW accounting. There are quite a few other places this could be used, but keeping it simple for now. --- src/or/command.c | 7 ++----- src/or/relay.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index 18cbbca25..4fa05a18b 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -504,11 +504,8 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); /* Count the payload bytes only. We don't care about cell headers */ - if (PREDICT_LIKELY(UINT32_MAX - ocirc->n_read_circ_bw > - CELL_PAYLOAD_SIZE)) - ocirc->n_read_circ_bw += (int)CELL_PAYLOAD_SIZE; - else - ocirc->n_read_circ_bw = UINT32_MAX; + ocirc->n_read_circ_bw = tor_add_u32_nowrap(ocirc->n_read_circ_bw, + CELL_PAYLOAD_SIZE); } if (!CIRCUIT_IS_ORIGIN(circ) && diff --git a/src/or/relay.c b/src/or/relay.c index d43720478..472e73b75 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -374,11 +374,8 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, /* Update circ written totals for control port */ origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); - if (PREDICT_LIKELY(UINT32_MAX - ocirc->n_written_circ_bw - > CELL_PAYLOAD_SIZE)) - ocirc->n_written_circ_bw += (int)CELL_PAYLOAD_SIZE; - else - ocirc->n_written_circ_bw = UINT32_MAX; + ocirc->n_written_circ_bw = tor_add_u32_nowrap(ocirc->n_written_circ_bw, + CELL_PAYLOAD_SIZE); } else { /* incoming cell */ if (CIRCUIT_IS_ORIGIN(circ)) {

1 0

[tor/master] Merge remote-tracking branch 'mikeperry/bug25400_squashed'
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 1ba9b7e0137afc1a4bd6da7dd986ed98999cfbe5 Merge: 0e8ae82a8 f921fd771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 20:39:35 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25400_squashed' changes/bug25400 | 5 +++++ src/common/util.c | 13 +++++++++++++ src/common/util.h | 2 ++ src/or/command.c | 11 +++++++++++ src/or/connection.c | 22 +--------------------- src/or/control.c | 8 -------- src/or/relay.c | 6 ++++++ src/test/test_util.c | 18 ++++++++++++++++++ 8 files changed, 56 insertions(+), 29 deletions(-)

1 0

[torspec/master] Change the oldest-allowed consensus method to 25.
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 708d0462d44a0adf02b5104e6a94609352866311 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 14:36:24 2018 -0400 Change the oldest-allowed consensus method to 25. --- dir-spec.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 1adfe69..5f2a713 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2793,6 +2793,9 @@ * If consensus-method 24 or later is in use, then routers that do not have the Valid flag are not listed at all. + [ As of 0.3.4.1-alpha, authorities no longer advertise or negotiate + any consensus methods lower than 25. ] + * If consensus-method 25 or later is in use, then we vote on recommended-protocols and required-protocols lines in the consensus. We also include protocols lines in routerstatus @@ -2899,11 +2902,11 @@ method that it supports (which will probably not result in a sufficiently signed consensus). - All authorities MUST support method 13; authorities SHOULD support + All authorities MUST support method 25; authorities SHOULD support more recent methods as well. Authorities SHOULD NOT support or - advertise support for any method before 13. Clients MAY assume that + advertise support for any method before 25. Clients MAY assume that they will never see a current valid signed consensus for any method - before method 13. + before method 25. (The consensuses generated by new methods must be parsable by implementations that only understand the old methods, and must not cause

1 0

[torspec/master] Merge remote-tracking branch 'public/bug24378_spec'
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit fb33ac263fc0b008dd1f568dd4b5d6e89e636f23 Merge: f59414d 708d046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 20:02:09 2018 -0400 Merge remote-tracking branch 'public/bug24378_spec' dir-spec.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Disable consensus methods before 25.
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 69347f48e00ae31222ce10d66c507293954e4fcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 9 14:31:51 2018 -0400 Disable consensus methods before 25. Consensus method 25 is the oldest one supported by any stable version of 0.2.9, which is our current most-recent LTS. Thus, by proposal 290, they should be removed. This commit does not actually remove the code to implement these methods: it only makes it so authorities will no longer support them. I'll remove the backend code for them in later commits. --- src/or/dirvote.c | 8 +------- src/or/dirvote.h | 2 +- src/test/test_dir.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c3cd0d3cd..265715505 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3951,13 +3951,7 @@ static const struct consensus_method_range_t { int low; int high; } microdesc_consensus_methods[] = { - {MIN_SUPPORTED_CONSENSUS_METHOD, MIN_METHOD_FOR_A_LINES - 1}, - {MIN_METHOD_FOR_A_LINES, MIN_METHOD_FOR_P6_LINES - 1}, - {MIN_METHOD_FOR_P6_LINES, MIN_METHOD_FOR_NTOR_KEY - 1}, - {MIN_METHOD_FOR_NTOR_KEY, MIN_METHOD_FOR_ID_HASH_IN_MD - 1}, - {MIN_METHOD_FOR_ID_HASH_IN_MD, MIN_METHOD_FOR_ED25519_ID_IN_MD - 1}, - {MIN_METHOD_FOR_ED25519_ID_IN_MD, - MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC - 1}, + {MIN_SUPPORTED_CONSENSUS_METHOD, MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC - 1}, {MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC, MAX_SUPPORTED_CONSENSUS_METHOD}, {-1, -1} }; diff --git a/src/or/dirvote.h b/src/or/dirvote.h index deeb27bfe..91da4edee 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -56,7 +56,7 @@ #define ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD 0 /** The lowest consensus method that we currently support. */ -#define MIN_SUPPORTED_CONSENSUS_METHOD 13 +#define MIN_SUPPORTED_CONSENSUS_METHOD 25 /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 28 diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 5fac045b2..6cafa7cb3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2917,8 +2917,9 @@ gen_routerstatus_for_umbw(int idx, time_t now) rs->addr = 0x99008801; rs->or_port = 443; rs->dir_port = 8000; - /* all flags but running cleared */ + /* all flags but running and valid cleared */ rs->is_flagged_running = 1; + rs->is_valid = 1; /* * This one has measured bandwidth below the clip cutoff, and * so shouldn't be clipped; we'll have to test that it isn't @@ -2991,8 +2992,9 @@ gen_routerstatus_for_umbw(int idx, time_t now) rs->addr = 0xC0000203; rs->or_port = 500; rs->dir_port = 1999; - /* all flags but running cleared */ + /* all flags but running and valid cleared */ rs->is_flagged_running = 1; + rs->is_valid = 1; /* * This one has unmeasured bandwidth below the clip cutoff, and * so shouldn't be clipped; we'll have to test that it isn't @@ -3014,7 +3016,7 @@ gen_routerstatus_for_umbw(int idx, time_t now) if (vrs) { vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); tor_asprintf(&vrs->microdesc->microdesc_hash_line, - "m 9,10,11,12,13,14,15,16,17 " + "m 25,26,27,28 " "sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa%d\n", idx); } @@ -3040,7 +3042,7 @@ vote_tweaks_for_umbw(networkstatus_t *v, int voter, time_t now) smartlist_clear(v->supported_methods); /* Method 17 is MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB */ smartlist_split_string(v->supported_methods, - "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17", + "25 26 27 28", NULL, 0, -1); /* If we're using a non-default clip bandwidth, add it to net_params */ if (alternate_clip_bw > 0) { @@ -3202,9 +3204,9 @@ test_routerstatus_for_umbw(routerstatus_t *rs, time_t now) tt_assert(!rs->is_fast); tt_assert(!rs->is_possible_guard); tt_assert(!rs->is_stable); - /* (If it wasn't running it wouldn't be here) */ + /* (If it wasn't running and valid it wouldn't be here) */ tt_assert(rs->is_flagged_running); - tt_assert(!rs->is_valid); + tt_assert(rs->is_valid); tt_assert(!rs->is_named); /* This one should have measured bandwidth below the clip cutoff */ tt_assert(rs->has_bandwidth);

1 0

[tor/master] Remove MIN_METHOD_FOR and MIN_METHOD_FOR_A_LINES
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 08373467b10a3e3c4765835d1820f86741b9f307 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 9 14:44:03 2018 -0400 Remove MIN_METHOD_FOR and MIN_METHOD_FOR_A_LINES Also, in networkstatus.c, remove client code for recognizing pre- MIN_METHOD_FOR_A_LINES consensuses, and corresponding unit tests in test_dir.c. --- src/or/dirvote.c | 15 ++++++--------- src/or/dirvote.h | 7 ------- src/or/networkstatus.c | 2 +- src/test/test_dir.c | 18 +++++------------- 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 265715505..1985d9067 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -549,12 +549,12 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, tor_assert(most); - /* If we're producing "a" lines, vote on potential alternative (sets - * of) OR port(s) in the winning routerstatuses. + /* Vote on potential alternative (sets of) OR port(s) in the winning + * routerstatuses. * * XXX prop186 There's at most one alternative OR port (_the_ IPv6 * port) for now. */ - if (consensus_method >= MIN_METHOD_FOR_A_LINES && best_alt_orport_out) { + if (best_alt_orport_out) { smartlist_t *alt_orports = smartlist_new(); const tor_addr_port_t *most_alt_orport = NULL; @@ -1890,10 +1890,8 @@ networkstatus_compute_consensus(smartlist_t *votes, rs_out.published_on = rs->status.published_on; rs_out.dir_port = rs->status.dir_port; rs_out.or_port = rs->status.or_port; - if (consensus_method >= MIN_METHOD_FOR_A_LINES) { - tor_addr_copy(&rs_out.ipv6_addr, &alt_orport.addr); - rs_out.ipv6_orport = alt_orport.port; - } + tor_addr_copy(&rs_out.ipv6_addr, &alt_orport.addr); + rs_out.ipv6_orport = alt_orport.port; rs_out.has_bandwidth = 0; rs_out.has_exitsummary = 0; @@ -3846,8 +3844,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) /* We originally put a lines in the micrdescriptors, but then we worked out * that we needed them in the microdesc consensus. See #20916. */ - if (consensus_method >= MIN_METHOD_FOR_A_LINES && - consensus_method < MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC && + if (consensus_method < MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC && !tor_addr_is_null(&ri->ipv6_addr) && ri->ipv6_orport) smartlist_add_asprintf(chunks, "a %s\n", fmt_addrport(&ri->ipv6_addr, ri->ipv6_orport)); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 91da4edee..9c7916a9b 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -61,13 +61,6 @@ /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 28 -/** Lowest consensus method where microdesc consensuses omit any entry - * with no microdesc. */ -#define MIN_METHOD_FOR_MANDATORY_MICRODESC 13 - -/** Lowest consensus method that contains "a" lines. */ -#define MIN_METHOD_FOR_A_LINES 14 - /** Lowest consensus method where microdescs may include a "p6" line. */ #define MIN_METHOD_FOR_P6_LINES 15 diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 235b95b70..d7088a167 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1528,7 +1528,7 @@ networkstatus_consensus_has_ipv6(const or_options_t* options) return cons->consensus_method >= MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS; } else { - return cons->consensus_method >= MIN_METHOD_FOR_A_LINES; + return 1; } } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6cafa7cb3..e5355069a 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -5771,22 +5771,10 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg) /* Test the bounds for A lines in the NS consensus */ mock_options->UseMicrodescriptors = 0; - mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES; + mock_networkstatus->consensus_method = MIN_SUPPORTED_CONSENSUS_METHOD; has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(has_ipv6); - mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES + 1; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES + 20; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES - 1; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(!has_ipv6); - /* Test the bounds for A lines in the microdesc consensus */ mock_options->UseMicrodescriptors = 1; @@ -5795,6 +5783,10 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg) has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(has_ipv6); + mock_networkstatus->consensus_method = MAX_SUPPORTED_CONSENSUS_METHOD + 20; + has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); + tt_assert(has_ipv6); + mock_networkstatus->consensus_method = MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 1; has_ipv6 = networkstatus_consensus_has_ipv6(get_options());

1 0

[tor/master] Remove MIN_METHOD_FOR_{PACKAGE_LINES, GUARDFRACTION, ED25519_ID_IN_MD}
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 4d6f21bb6b43fb79bb4a659ced8aa898a42389a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 9 14:59:34 2018 -0400 Remove MIN_METHOD_FOR_{PACKAGE_LINES,GUARDFRACTION,ED25519_ID_IN_MD} Also remove a rest for pre-19 microdesc versions. --- src/or/dirvote.c | 19 +++---------------- src/or/dirvote.h | 12 ------------ src/test/test_microdesc.c | 15 --------------- 3 files changed, 3 insertions(+), 43 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 1a21def46..80db32eb5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -664,13 +664,6 @@ compute_consensus_method(smartlist_t *votes) static int consensus_method_is_supported(int method) { - if (method == MIN_METHOD_FOR_ED25519_ID_IN_MD) { - /* This method was broken due to buggy code accidentally left in - * dircollate.c; do not actually use it. - */ - return 0; - } - return (method >= MIN_SUPPORTED_CONSENSUS_METHOD) && (method <= MAX_SUPPORTED_CONSENSUS_METHOD); } @@ -1455,11 +1448,7 @@ networkstatus_compute_consensus(smartlist_t *votes, n_versioning_servers); client_versions = compute_consensus_versions_list(combined_client_versions, n_versioning_clients); - if (consensus_method >= MIN_METHOD_FOR_PACKAGE_LINES) { - packages = compute_consensus_package_lines(votes); - } else { - packages = tor_strdup(""); - } + packages = compute_consensus_package_lines(votes); SMARTLIST_FOREACH(combined_server_versions, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(combined_client_versions, char *, cp, tor_free(cp)); @@ -1971,8 +1960,7 @@ networkstatus_compute_consensus(smartlist_t *votes, /* If it's a guard and we have enough guardfraction votes, calculate its consensus guardfraction value. */ - if (is_guard && num_guardfraction_inputs > 2 && - consensus_method >= MIN_METHOD_FOR_GUARDFRACTION) { + if (is_guard && num_guardfraction_inputs > 2) { rs_out.has_guardfraction = 1; rs_out.guardfraction_percentage = median_uint32(measured_guardfraction, num_guardfraction_inputs); @@ -3865,8 +3853,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) { char idbuf[ED25519_BASE64_LEN+1]; const char *keytype; - if (consensus_method >= MIN_METHOD_FOR_ED25519_ID_IN_MD && - ri->cache_info.signing_key_cert && + if (ri->cache_info.signing_key_cert && ri->cache_info.signing_key_cert->signing_key_included) { keytype = "ed25519"; ed25519_public_to_base64(idbuf, diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 334dc0732..14fa8e0ad 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -61,18 +61,6 @@ /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 28 -/** Lowest consensus method where we include "package" lines*/ -#define MIN_METHOD_FOR_PACKAGE_LINES 19 - -/** Lowest consensus method where authorities may include - * GuardFraction information in microdescriptors. */ -#define MIN_METHOD_FOR_GUARDFRACTION 20 - -/** Lowest consensus method where authorities may include an "id" line for - * ed25519 identities in microdescriptors. (Broken; see - * consensus_method_is_supported() for more info.) */ -#define MIN_METHOD_FOR_ED25519_ID_IN_MD 21 - /** Lowest consensus method where authorities vote on ed25519 ids and ensure * ed25519 id consistency. */ #define MIN_METHOD_FOR_ED25519_ID_VOTING 22 diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index fc565ebf3..3d02fc1a5 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -396,16 +396,6 @@ static const char test_md_18[] = "p reject 25,119,135-139,445,563,1214,4661-4666,6346-6429,6699,6881-6999\n" "id rsa1024 Cd47okjCHD83YGzThGBDptXs9Z4\n"; -static const char test_md2_18[] = - "onion-key\n" - "-----BEGIN RSA PUBLIC KEY-----\n" - "MIGJAoGBAL2R8EfubUcahxha4u02P4VAR0llQIMwFAmrHPjzcK7apcQgDOf2ovOA\n" - "+YQnJFxlpBmCoCZC6ssCi+9G0mqo650lFuTMP5I90BdtjotfzESfTykHLiChyvhd\n" - "l0dlqclb2SU/GKem/fLRXH16aNi72CdSUu/1slKs/70ILi34QixRAgMBAAE=\n" - "-----END RSA PUBLIC KEY-----\n" - "ntor-onion-key hbxdRnfVUJJY7+KcT4E3Rs7/zuClbN3hJrjSBiEGMgI=\n" - "id rsa1024 t+J/EEITw28T5+mCkYKEXklZl6A\n"; - static const char test_md2_21[] = "onion-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" @@ -441,11 +431,6 @@ test_md_generate(void *arg) microdesc_free(md); md = NULL; - md = dirvote_create_microdescriptor(ri, 18); - tt_str_op(md->body, OP_EQ, test_md2_18); - - microdesc_free(md); - md = NULL; md = dirvote_create_microdescriptor(ri, 21); tt_str_op(md->body, OP_EQ, test_md2_21); tt_assert(ed25519_pubkey_eq(md->ed25519_identity_pkey,

1 0

[tor/master] Remove MIN_METHOD_{FOR_P6_LINES, FOR_NTOR_KEY, TO_CLIP_UNMEASURED_BW}
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit 93380db8333609b8613a1e987894c6f1fd8be6aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 9 14:51:36 2018 -0400 Remove MIN_METHOD_{FOR_P6_LINES,FOR_NTOR_KEY,TO_CLIP_UNMEASURED_BW} Also remove a unit test for pre-MIN_METHOD_FOR_NTOR_KEY consensuses. --- src/or/dirvote.c | 14 +++++--------- src/or/dirvote.h | 11 ----------- src/test/test_microdesc.c | 11 ----------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 1985d9067..334ebfb7f 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1601,7 +1601,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_free(dir_sources); } - if (consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW) { + { char *max_unmeasured_param = NULL; /* XXXX Extract this code into a common function. Or don't! see #19011 */ if (params) { @@ -1989,8 +1989,7 @@ networkstatus_compute_consensus(smartlist_t *votes, rs_out.has_bandwidth = 1; rs_out.bw_is_unmeasured = 1; rs_out.bandwidth_kb = median_uint32(bandwidths_kb, num_bandwidths); - if (consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW && - n_authorities_measuring_bandwidth > 2) { + if (n_authorities_measuring_bandwidth > 2) { /* Cap non-measured bandwidths. */ if (rs_out.bandwidth_kb > max_unmeasured_bw_kb) { rs_out.bandwidth_kb = max_unmeasured_bw_kb; @@ -2130,8 +2129,7 @@ networkstatus_compute_consensus(smartlist_t *votes, /* Now the weight line. */ if (rs_out.has_bandwidth) { char *guardfraction_str = NULL; - int unmeasured = rs_out.bw_is_unmeasured && - consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW; + int unmeasured = rs_out.bw_is_unmeasured; /* If we have guardfraction info, include it in the 'w' line. */ if (rs_out.has_guardfraction) { @@ -3833,8 +3831,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) smartlist_add_asprintf(chunks, "onion-key\n%s", key); - if (consensus_method >= MIN_METHOD_FOR_NTOR_KEY && - ri->onion_curve25519_pkey) { + if (ri->onion_curve25519_pkey) { char kbuf[128]; base64_encode(kbuf, sizeof(kbuf), (const char*)ri->onion_curve25519_pkey->public_key, @@ -3855,8 +3852,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) if (summary && strcmp(summary, "reject 1-65535")) smartlist_add_asprintf(chunks, "p %s\n", summary); - if (consensus_method >= MIN_METHOD_FOR_P6_LINES && - ri->ipv6_exit_policy) { + if (ri->ipv6_exit_policy) { /* XXXX+++ This doesn't match proposal 208, which says these should * be taken unchanged from the routerinfo. That's bogosity, IMO: * the proposal should have said to do this instead.*/ diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 9c7916a9b..311bc61e1 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -61,17 +61,6 @@ /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 28 -/** Lowest consensus method where microdescs may include a "p6" line. */ -#define MIN_METHOD_FOR_P6_LINES 15 - -/** Lowest consensus method where microdescs may include an onion-key-ntor - * line */ -#define MIN_METHOD_FOR_NTOR_KEY 16 - -/** Lowest consensus method that ensures that authorities output an - * Unmeasured=1 flag for unmeasured bandwidths */ -#define MIN_METHOD_TO_CLIP_UNMEASURED_BW 17 - /** Lowest consensus method where authorities may include an "id" line in * microdescriptors. */ #define MIN_METHOD_FOR_ID_HASH_IN_MD 18 diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 59b28f758..c0eced1bb 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -385,15 +385,6 @@ static const char test_ri2[] = "cf34GXHv61XReJF3AlzNHFpbrPOYmowmhrTULKyMqow=\n" "-----END SIGNATURE-----\n"; -static const char test_md_8[] = - "onion-key\n" - "-----BEGIN RSA PUBLIC KEY-----\n" - "MIGJAoGBANBJz8Vldl12aFeSMPLiA4nOetLDN0oxU8bB1SDhO7Uu2zdWYVYAF5J0\n" - "st7WvrVy/jA9v/fsezNAPskBanecHRSkdMTpkcgRPMHE7CTGEwIy1Yp1X4bPgDlC\n" - "VCnbs5Pcts5HnWEYNK7qHDAUn+IlmjOO+pTUY8uyq+GQVz6H9wFlAgMBAAE=\n" - "-----END RSA PUBLIC KEY-----\n" - "p reject 25,119,135-139,445,563,1214,4661-4666,6346-6429,6699,6881-6999\n"; - static const char test_md_16[] = "onion-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" @@ -444,8 +435,6 @@ test_md_generate(void *arg) ri = router_parse_entry_from_string(test_ri, NULL, 0, 0, NULL, NULL); tt_assert(ri); - md = dirvote_create_microdescriptor(ri, 8); - tt_str_op(md->body, OP_EQ, test_md_8); /* XXXX test family lines. */ /* XXXX test method 14 for A lines. */

1 0

[tor/master] Remove MIN_METHOD_FOR_ID_HASH_IN_MD and a test for running without it.
by nickm＠torproject.org 22 Apr '18

22 Apr '18

commit caf766991dfd82dd1599ce90adc8afb9e749f468 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 9 14:54:46 2018 -0400 Remove MIN_METHOD_FOR_ID_HASH_IN_MD and a test for running without it. --- src/or/dirvote.c | 2 +- src/or/dirvote.h | 4 ---- src/test/test_microdesc.c | 19 ------------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 334ebfb7f..1a21def46 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3862,7 +3862,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) tor_free(p6); } - if (consensus_method >= MIN_METHOD_FOR_ID_HASH_IN_MD) { + { char idbuf[ED25519_BASE64_LEN+1]; const char *keytype; if (consensus_method >= MIN_METHOD_FOR_ED25519_ID_IN_MD && diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 311bc61e1..334dc0732 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -61,10 +61,6 @@ /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 28 -/** Lowest consensus method where authorities may include an "id" line in - * microdescriptors. */ -#define MIN_METHOD_FOR_ID_HASH_IN_MD 18 - /** Lowest consensus method where we include "package" lines*/ #define MIN_METHOD_FOR_PACKAGE_LINES 19 diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index c0eced1bb..fc565ebf3 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -385,16 +385,6 @@ static const char test_ri2[] = "cf34GXHv61XReJF3AlzNHFpbrPOYmowmhrTULKyMqow=\n" "-----END SIGNATURE-----\n"; -static const char test_md_16[] = - "onion-key\n" - "-----BEGIN RSA PUBLIC KEY-----\n" - "MIGJAoGBANBJz8Vldl12aFeSMPLiA4nOetLDN0oxU8bB1SDhO7Uu2zdWYVYAF5J0\n" - "st7WvrVy/jA9v/fsezNAPskBanecHRSkdMTpkcgRPMHE7CTGEwIy1Yp1X4bPgDlC\n" - "VCnbs5Pcts5HnWEYNK7qHDAUn+IlmjOO+pTUY8uyq+GQVz6H9wFlAgMBAAE=\n" - "-----END RSA PUBLIC KEY-----\n" - "ntor-onion-key Gg73xH7+kTfT6bi1uNVx9gwQdQas9pROIfmc4NpAdC4=\n" - "p reject 25,119,135-139,445,563,1214,4661-4666,6346-6429,6699,6881-6999\n"; - static const char test_md_18[] = "onion-key\n" "-----BEGIN RSA PUBLIC KEY-----\n" @@ -436,15 +426,6 @@ test_md_generate(void *arg) ri = router_parse_entry_from_string(test_ri, NULL, 0, 0, NULL, NULL); tt_assert(ri); - /* XXXX test family lines. */ - /* XXXX test method 14 for A lines. */ - /* XXXX test method 15 for P6 lines. */ - - microdesc_free(md); - md = NULL; - md = dirvote_create_microdescriptor(ri, 16); - tt_str_op(md->body, OP_EQ, test_md_16); - microdesc_free(md); md = NULL; md = dirvote_create_microdescriptor(ri, 18);

1 0