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

[torspec/master] Adding 'bwweightscale' parameter
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit bc51eaaac113b60710e16b987a3cb60332a1a881 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 16 18:16:56 2012 -0700 Adding 'bwweightscale' parameter The network status document's "bandwidths-weights" line mentions an undocumented parameter. Adding it to the params section. This addresses... https://trac.torproject.org/6872 --- dir-spec.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index c18efcf..249c950 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1266,6 +1266,10 @@ proxies. See trac entry 1751 for details. Min: 0, Max: 1 + "bwweightscale" -- Value that bandwidth-weights are divided by. If not + present then this defaults to 10000. + Min: 1 + "cbtdisabled", "cbtnummodes", "cbtrecentcount", "cbtmaxtimeouts", "cbtmincircs", "cbtquantile", "cbtclosequantile", "cbttestfreq", "cbtmintimeout", and "cbtinitialtimeout" -- see "2.4.5. Consensus @@ -1461,9 +1465,8 @@ "Wmb=" INT SP "Wmd=" INT SP "Wme=" INT SP "Wmg=" INT SP "Wmm=" INT NL These values represent the weights to apply to router bandwidths - during path selection. They are sorted in lexical order (as ASCII byte - strings). The integer values are divided by BW_WEIGHT_SCALE=10000 or - the consensus param "bwweightscale". They are: + during path selection. Values are divided by the consensus' + "bwweightscale" param. Definition of our entries are... Wgg - Weight for Guard-flagged nodes in the guard position Wgm - Weight for non-flagged nodes in the guard Position

1 0

[torspec/master] Merge remote-tracking branch 'atagar/6872'
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit eacdd6ec6c8ba1c29a4b2d6d1d095b73887a6b89 Merge: b829224 bc51eaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 17:23:06 2012 -0400 Merge remote-tracking branch 'atagar/6872' dir-spec.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set.
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit bee1e46bd179b4085f47f3f3fc34db94e67e1c72 Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Sep 17 20:21:22 2012 +0200 Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set. This affects both directory authorities and bridge authoritites. --- changes/bug6880 | 3 +++ src/or/dirserv.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug6880 b/changes/bug6880 new file mode 100644 index 0000000..c08a2d4 --- /dev/null +++ b/changes/bug6880 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't do reachability testing over IPv6 unless + AuthDirPublishIPv6 is set. Fix for bug 6880. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a8f2fb9..d355690 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3415,7 +3415,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) router->cache_info.identity_digest); /* Possible IPv6. */ - if (!tor_addr_is_null(&router->ipv6_addr)) { + if (get_options()->AuthDirHasIPv6Connectivity == 1 && + !tor_addr_is_null(&router->ipv6_addr)) { char addrstr[TOR_ADDR_BUF_LEN]; log_debug(LD_OR, "Testing reachability of %s at %s:%u.", router->nickname,

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6880'
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 5dfec9f8335d0fa954ff5423a41e3e249547fd8d Merge: 1e5cd1c bee1e46 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 16:05:09 2012 -0400 Merge remote-tracking branch 'linus/bug6880' changes/bug6880 | 3 +++ src/or/dirserv.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix comment typo in tor_memeq
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 1e5cd1c7d6f45456c5e7c1b288e5e02e7c02b377 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Sep 17 11:13:09 2012 -0400 Fix comment typo in tor_memeq --- src/common/di_ops.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/di_ops.c b/src/common/di_ops.c index 7683c59..418d6e3 100644 --- a/src/common/di_ops.c +++ b/src/common/di_ops.c @@ -123,7 +123,7 @@ tor_memeq(const void *a, const void *b, size_t sz) * * If any_difference != 0: * 0 < any_difference < 256, so - * 0 < any_difference - 1 < 255 + * 0 <= any_difference - 1 < 255 * (any_difference - 1) >> 8 == 0 * 1 & ((any_difference - 1) >> 8) == 0 */

1 0

[tor/master] Make crypto_pk_cmp_keys do something sane for NULL keys
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit f3916a685594a6e0e4f4a215a57f5aea34c8570c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Sep 15 02:47:14 2012 -0700 Make crypto_pk_cmp_keys do something sane for NULL keys Fixes bug 4283; bugfix on r76 (Git commit 01aadefbfc7dbd99ddaff922b897996b768cf2f9). --- src/common/crypto.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 7768cc3..5b5fb75 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -748,19 +748,23 @@ crypto_pk_public_exponent_ok(crypto_pk_t *env) return BN_is_word(env->key->e, 65537); } -/** Compare the public-key components of a and b. Return -1 if a\<b, 0 - * if a==b, and 1 if a\>b. +/** Compare the public-key components of a and b. Return -1 if a\<b, + * 0 if a==b, and 1 if a\>b. A NULL key is considered to be less than + * all non-NULL keys, and equal to itself. + * + * Note that this may leak information about the keys through timing. */ int crypto_pk_cmp_keys(crypto_pk_t *a, crypto_pk_t *b) { int result; + char a_is_non_null = (a != NULL) && (a->key != NULL); + char b_is_non_null = (b != NULL) && (b->key != NULL); + char an_argument_is_null = !a_is_non_null | !b_is_non_null; - if (!a || !b) - return -1; - - if (!a->key || !b->key) - return -1; + result = tor_memcmp(&a_is_non_null, &b_is_non_null, sizeof(a_is_non_null)); + if (an_argument_is_null) + return result; tor_assert(PUBLIC_KEY_OK(a)); tor_assert(PUBLIC_KEY_OK(b));

1 0

[tor/master] Implement and use crypto_pk_eq_keys
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 62babcaf0a88edb081529977981cf8865b32ea21 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Sep 15 03:52:13 2012 -0700 Implement and use crypto_pk_eq_keys --- src/common/crypto.c | 12 ++++++++++++ src/common/crypto.h | 1 + src/or/rendservice.c | 2 +- src/or/router.c | 11 +++++------ src/or/routerlist.c | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 5b5fb75..283b005 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -774,6 +774,18 @@ crypto_pk_cmp_keys(crypto_pk_t *a, crypto_pk_t *b) return BN_cmp((a->key)->e, (b->key)->e); } +/** Compare the public-key components of a and b. Return non-zero iff + * a==b. A NULL key is considered to be distinct from all non-NULL + * keys, and equal to itself. + * + * Note that this may leak information about the keys through timing. + */ +int +crypto_pk_eq_keys(crypto_pk_t *a, crypto_pk_t *b) +{ + return (crypto_pk_cmp_keys(a, b) == 0); +} + /** Return the size of the public key modulus in <b>env</b>, in bytes. */ size_t crypto_pk_keysize(crypto_pk_t *env) diff --git a/src/common/crypto.h b/src/common/crypto.h index 456a611..e824850 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -148,6 +148,7 @@ int crypto_pk_write_private_key_to_filename(crypto_pk_t *env, int crypto_pk_check_key(crypto_pk_t *env); int crypto_pk_cmp_keys(crypto_pk_t *a, crypto_pk_t *b); +int crypto_pk_eq_keys(crypto_pk_t *a, crypto_pk_t *b); size_t crypto_pk_keysize(crypto_pk_t *env); int crypto_pk_num_bits(crypto_pk_t *env); crypto_pk_t *crypto_pk_dup_key(crypto_pk_t *orig); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0bfa17d..0fa04b6 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2730,7 +2730,7 @@ find_intro_point(origin_circuit_t *circ) if (service == NULL) return NULL; SMARTLIST_FOREACH(service->intro_nodes, rend_intro_point_t *, intro_point, - if (crypto_pk_cmp_keys(intro_point->intro_key, circ->intro_key) == 0) { + if (crypto_pk_eq_keys(intro_point->intro_key, circ->intro_key)) { return intro_point; }); diff --git a/src/or/router.c b/src/or/router.c index 052ed38..2e80c54 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -87,7 +87,7 @@ static authority_cert_t *legacy_key_certificate = NULL; static void set_onion_key(crypto_pk_t *k) { - if (onionkey && !crypto_pk_cmp_keys(onionkey, k)) { + if (onionkey && crypto_pk_eq_keys(onionkey, k)) { /* k is already our onion key; free it and return */ crypto_pk_free(k); return; @@ -155,12 +155,11 @@ assert_identity_keys_ok(void) if (public_server_mode(get_options())) { /* assert that we have set the client and server keys to be equal */ tor_assert(server_identitykey); - tor_assert(0==crypto_pk_cmp_keys(client_identitykey, server_identitykey)); + tor_assert(crypto_pk_eq_keys(client_identitykey, server_identitykey)); } else { /* assert that we have set the client and server keys to be unequal */ if (server_identitykey) - tor_assert(0!=crypto_pk_cmp_keys(client_identitykey, - server_identitykey)); + tor_assert(!crypto_pk_eq_keys(client_identitykey, server_identitykey)); } } @@ -400,7 +399,7 @@ load_authority_keyset(int legacy, crypto_pk_t **key_out, log_warn(LD_DIR, "Unable to parse certificate in %s", fname); goto done; } - if (crypto_pk_cmp_keys(signing_key, parsed->signing_key) != 0) { + if (!crypto_pk_eq_keys(signing_key, parsed->signing_key)) { log_warn(LD_DIR, "Stored signing key does not match signing key in " "certificate"); goto done; @@ -2008,7 +2007,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, const or_options_t *options = get_options(); /* Make sure the identity key matches the one in the routerinfo. */ - if (crypto_pk_cmp_keys(ident_key, router->identity_pkey)) { + if (!crypto_pk_eq_keys(ident_key, router->identity_pkey)) { log_warn(LD_BUG,"Tried to sign a router with a private key that didn't " "match router's public key!"); return -1; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 98357d6..5327622 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4529,8 +4529,8 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2) r1->ipv6_orport != r2->ipv6_orport || r1->dir_port != r2->dir_port || r1->purpose != r2->purpose || - crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) || - crypto_pk_cmp_keys(r1->identity_pkey, r2->identity_pkey) || + !crypto_pk_eq_keys(r1->onion_pkey, r2->onion_pkey) || + !crypto_pk_eq_keys(r1->identity_pkey, r2->identity_pkey) || strcasecmp(r1->platform, r2->platform) || (r1->contact_info && !r2->contact_info) || /* contact_info is optional */ (!r1->contact_info && r2->contact_info) ||

1 0

[tor/master] Add unit test for crypto_pk_cmp_keys and NULL
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 757b3b259eba27881a8b5616ba45d42798c1ade8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 10:34:08 2012 -0400 Add unit test for crypto_pk_cmp_keys and NULL --- src/test/test_crypto.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 7f4347a..fd983de 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -427,6 +427,11 @@ test_crypto_pk(void) test_assert(! crypto_pk_read_public_key_from_string(pk2, encoded, size)); test_eq(0, crypto_pk_cmp_keys(pk1, pk2)); + /* comparison between keys and NULL */ + tt_int_op(crypto_pk_cmp_keys(NULL, pk1), <, 0); + tt_int_op(crypto_pk_cmp_keys(NULL, NULL), ==, 0); + tt_int_op(crypto_pk_cmp_keys(pk1, NULL), >, 0); + test_eq(128, crypto_pk_keysize(pk1)); test_eq(1024, crypto_pk_num_bits(pk1)); test_eq(128, crypto_pk_keysize(pk2));

1 0

[tor/master] Fix documentation for crypto_pk_cmp_keys
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit cd884c764b2e8c5b1127829706de59a71b362b4c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Sep 17 10:23:23 2012 -0400 Fix documentation for crypto_pk_cmp_keys Now that crypto_pk_cmp_keys might return the result of tor_memcmp, there is no guarantee that it will only return -1, 0, or 1. (It currently does only return -1, 0, or 1, but that's a lucky accident due to details of the current implementation of tor_memcmp and the particular input given to it.) Fortunately, none of crypto_pk_cmp_keys's callers rely on this behaviour, so changing its documentation is sufficient. --- src/common/crypto.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 283b005..5cab058 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -748,9 +748,9 @@ crypto_pk_public_exponent_ok(crypto_pk_t *env) return BN_is_word(env->key->e, 65537); } -/** Compare the public-key components of a and b. Return -1 if a\<b, - * 0 if a==b, and 1 if a\>b. A NULL key is considered to be less than - * all non-NULL keys, and equal to itself. +/** Compare the public-key components of a and b. Return less than 0 + * if a\<b, 0 if a==b, and greater than 0 if a\>b. A NULL key is + * considered to be less than all non-NULL keys, and equal to itself. * * Note that this may leak information about the keys through timing. */

1 0

[tor/master] Parse votes with >31 flags correctly
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 414adb237bc51e0e1b7321364dd73d9b3e635733 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 10:24:52 2012 -0400 Parse votes with >31 flags correctly We were doing (1<<p) to generate a flag at position p, but we should have been doing (U64_LITERAL(1)<<p). Fixes bug 6861; bugfix on 0.2.0.3-alpha; reported pseudonymously. --- changes/bug6853 | 3 +++ src/or/routerparse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug6853 b/changes/bug6853 new file mode 100644 index 0000000..382adfb --- /dev/null +++ b/changes/bug6853 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority): + - Correctly handle votes with more than 31 flags. Fixes bug 6853; + bugfix on 0.2.0.3-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2bf072b..022add3 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2067,7 +2067,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, for (i=0; i < tok->n_args; ++i) { int p = smartlist_string_pos(vote->known_flags, tok->args[i]); if (p >= 0) { - vote_rs->flags |= (1<<p); + vote_rs->flags |= (U64_LITERAL(1)<<p); } else { log_warn(LD_DIR, "Flags line had a flag %s not listed in known_flags.", escaped(tok->args[i]));

1 0