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

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 5e3c545af7c5801a370d416b033f1c4400f8403d Merge: ef164346d b062730a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.2' changes/ticket25170 | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 17a923941a41d9283cad0cb093024c872fafdb0a Merge: 91109bc81 e658dad62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 6a35e7d69abfc7394bb673a2e3c338cc4ee2c1dd Merge: 3fda19ef2 b062730a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit b9b7013062265e0c38c4ccd564c3b2d95d298028 Merge: 0f4b1020a 17a923941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 17a923941a41d9283cad0cb093024c872fafdb0a Merge: 91109bc81 e658dad62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit b062730a11a78f9cb11e4b0af20a66997280c0f9 Merge: 021c3bd58 17a923941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix a typo in an address_set.c comment.
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 99fbbc6c478d346a469e61663a319c8cf03fec44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 10:59:46 2018 -0500 Fix a typo in an address_set.c comment. --- src/common/address_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/address_set.c b/src/common/address_set.c index 6fa942b0d..4924cb65c 100644 --- a/src/common/address_set.c +++ b/src/common/address_set.c @@ -22,7 +22,7 @@ /** How many 64-bit siphash values to extract per address */ #define N_HASHES 2 /** How many bloom-filter bits we set per address. This is twice the N_HASHES - * value, since we split the siphash outcome two 32-bit values. */ + * value, since we split the siphash output into two 32-bit values. */ #define N_BITS_PER_ITEM (N_HASHES * 2) /* XXXX This code is largely duplicated with digestset_t. We should merge

1 0

[tor/master] Have tor_addr hashes return a randomized hash for AF_UNSPEC.
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 1555946e202fef523b35e169c90892b57caea766 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 11:08:33 2018 -0500 Have tor_addr hashes return a randomized hash for AF_UNSPEC. We don't expect this to come up very much, but we may as well make sure that the value isn't predictable (as we do for the other addresses) in case the issue ever comes up. Spotted by teor. --- src/common/address.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 1bd52d24b..68ad63941 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1181,6 +1181,9 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, } } +/** Input for siphash, to produce some output for an unspec value. */ +static const uint32_t unspec_hash_input[] = { 0x4e4df09f, 0x92985342 }; + /** Return a hash code based on the address addr. DOCDOC extra */ uint64_t tor_addr_hash(const tor_addr_t *addr) @@ -1189,7 +1192,7 @@ tor_addr_hash(const tor_addr_t *addr) case AF_INET: return siphash24g(&addr->addr.in_addr.s_addr, 4); case AF_UNSPEC: - return 0x4e4d5342; + return siphash24g(unspec_hash_input, sizeof(unspec_hash_input)); case AF_INET6: return siphash24g(&addr->addr.in6_addr.s6_addr, 16); default: @@ -1211,7 +1214,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr) case AF_INET: return siphash24(&addr->addr.in_addr.s_addr, 4, key); case AF_UNSPEC: - return 0x4e4d5342; + return siphash24(unspec_hash_input, sizeof(unspec_hash_input), key); case AF_INET6: return siphash24(&addr->addr.in6_addr.s6_addr, 16, key); default:

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit ef164346d4c6ee1b315e73917f3ec007b714a355 Merge: 4f98ec9fd 1555946e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:47:06 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/common/address.c | 7 +++++-- src/common/address_set.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --cc src/common/address.c index 1946a5f50,68ad63941..a2f4c93b9 --- a/src/common/address.c +++ b/src/common/address.c @@@ -1193,14 -1192,14 +1196,14 @@@ tor_addr_hash(const tor_addr_t *addr case AF_INET: return siphash24g(&addr->addr.in_addr.s_addr, 4); case AF_UNSPEC: - return 0x4e4d5342; + return siphash24g(unspec_hash_input, sizeof(unspec_hash_input)); case AF_INET6: return siphash24g(&addr->addr.in6_addr.s6_addr, 16); - default: /* LCOV_EXCL_START */ + default: tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } }

1 0