November 2015 - tor-commits - lists.torproject.org

[tor/master] add changes for feature17663
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 1a7f6df688d3879fd5ee378dfd8ea9f22a40020e Author: George Tankersley <george.tankersley(a)gmail.com> Date: Tue Nov 24 02:24:22 2015 +0000 add changes for feature17663 --- changes/feature17663 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changes/feature17663 b/changes/feature17663 new file mode 100644 index 0000000..f867c03 --- /dev/null +++ b/changes/feature17663 @@ -0,0 +1,2 @@ + o Minor feature: + - Adds SHA512 support to crypto.c

1 0

[tor/master] Merge remote-tracking branch 'gtank/feature17663'
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 74e5385da701392c3fb72487753831b30a0b0c5c Merge: 2079ec9 1a7f6df Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:00:01 2015 -0500 Merge remote-tracking branch 'gtank/feature17663' changes/feature17663 | 2 ++ src/common/crypto.c | 89 +++++++++++++++++++++++++++++++++++++++++------- src/common/crypto.h | 19 ++++++++--- src/test/test_crypto.c | 28 +++++++++++++++ 4 files changed, 122 insertions(+), 16 deletions(-)

1 0

[tor/master] Tweak gtank's sha512 patch a little
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 7194d3d95705a30cec69574ff2800cba8e739df9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 09:04:17 2015 -0500 Tweak gtank's sha512 patch a little --- changes/feature17663 | 5 +++-- src/common/crypto.c | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/feature17663 b/changes/feature17663 index f867c03..baad943 100644 --- a/changes/feature17663 +++ b/changes/feature17663 @@ -1,2 +1,3 @@ - o Minor feature: - - Adds SHA512 support to crypto.c + o Minor feature (crypto): + - Add SHA512 support to crypto.c. Closes ticket 17663; patch from + George Tankersley. diff --git a/src/common/crypto.c b/src/common/crypto.c index 72e08c9..5879719 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1890,8 +1890,7 @@ crypto_digest_smartlist_prefix(char *digest_out, size_t len_out, crypto_digest_get_digest(d, digest_out, len_out); free: - if (d != NULL) - crypto_digest_free(d); + crypto_digest_free(d); } /** Compute the HMAC-SHA-256 of the <b>msg_len</b> bytes in <b>msg</b>, using

1 0

[tor/master] Use SHA256 in the replaycache, rather than SHA1
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 2e9779e5d84db3e0d7b51ea34e73828253a298c2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Nov 24 09:08:53 2015 +1100 Use SHA256 in the replaycache, rather than SHA1 This migrates away from SHA1, and provides further hash flooding protection on top of the randomised siphash implementation. Add unit tests to make sure that different inputs don't have the same hash. --- changes/feature8961-replaycache-sha256 | 4 ++++ src/or/replaycache.c | 26 ++++++++++++------------ src/or/replaycache.h | 2 +- src/test/test_replay.c | 34 +++++++++++++++++++++++++++++++- 4 files changed, 51 insertions(+), 15 deletions(-) diff --git a/changes/feature8961-replaycache-sha256 b/changes/feature8961-replaycache-sha256 new file mode 100644 index 0000000..c5b5c85 --- /dev/null +++ b/changes/feature8961-replaycache-sha256 @@ -0,0 +1,4 @@ + o Minor enhancement (replaycache): + - The replay cache now uses SHA256 instead of SHA1. + Implements feature #8961. + Patch by "teor", issue reported by "rransom". diff --git a/src/or/replaycache.c b/src/or/replaycache.c index 569e073..82e5c44 100644 --- a/src/or/replaycache.c +++ b/src/or/replaycache.c @@ -23,7 +23,7 @@ replaycache_free(replaycache_t *r) return; } - if (r->digests_seen) digestmap_free(r->digests_seen, tor_free_); + if (r->digests_seen) digest256map_free(r->digests_seen, tor_free_); tor_free(r); } @@ -54,7 +54,7 @@ replaycache_new(time_t horizon, time_t interval) r->scrub_interval = interval; r->scrubbed = 0; r->horizon = horizon; - r->digests_seen = digestmap_new(); + r->digests_seen = digest256map_new(); err: return r; @@ -69,7 +69,7 @@ replaycache_add_and_test_internal( time_t *elapsed) { int rv = 0; - char digest[DIGEST_LEN]; + uint8_t digest[DIGEST256_LEN]; time_t *access_time; /* sanity check */ @@ -80,10 +80,10 @@ replaycache_add_and_test_internal( } /* compute digest */ - crypto_digest(digest, (const char *)data, len); + crypto_digest256((char *)digest, (const char *)data, len, DIGEST_SHA256); /* check map */ - access_time = digestmap_get(r->digests_seen, digest); + access_time = digest256map_get(r->digests_seen, digest); /* seen before? */ if (access_time != NULL) { @@ -114,7 +114,7 @@ replaycache_add_and_test_internal( /* No, so no hit and update the digest map with the current time */ access_time = tor_malloc(sizeof(*access_time)); *access_time = present; - digestmap_set(r->digests_seen, digest, access_time); + digest256map_set(r->digests_seen, digest, access_time); } /* now scrub the cache if it's time */ @@ -130,8 +130,8 @@ replaycache_add_and_test_internal( STATIC void replaycache_scrub_if_needed_internal(time_t present, replaycache_t *r) { - digestmap_iter_t *itr = NULL; - const char *digest; + digest256map_iter_t *itr = NULL; + const uint8_t *digest; void *valp; time_t *access_time; @@ -149,19 +149,19 @@ replaycache_scrub_if_needed_internal(time_t present, replaycache_t *r) if (r->horizon == 0) return; /* okay, scrub time */ - itr = digestmap_iter_init(r->digests_seen); - while (!digestmap_iter_done(itr)) { - digestmap_iter_get(itr, &digest, &valp); + itr = digest256map_iter_init(r->digests_seen); + while (!digest256map_iter_done(itr)) { + digest256map_iter_get(itr, &digest, &valp); access_time = (time_t *)valp; /* aged out yet? */ if (*access_time < present - r->horizon) { /* Advance the iterator and remove this one */ - itr = digestmap_iter_next_rmv(r->digests_seen, itr); + itr = digest256map_iter_next_rmv(r->digests_seen, itr); /* Free the value removed */ tor_free(access_time); } else { /* Just advance the iterator */ - itr = digestmap_iter_next(r->digests_seen, itr); + itr = digest256map_iter_next(r->digests_seen, itr); } } diff --git a/src/or/replaycache.h b/src/or/replaycache.h index 9b9daf3..9c409f2 100644 --- a/src/or/replaycache.h +++ b/src/or/replaycache.h @@ -26,7 +26,7 @@ struct replaycache_s { /* * Digest map: keys are digests, values are times the digest was last seen */ - digestmap_t *digests_seen; + digest256map_t *digests_seen; }; #endif /* REPLAYCACHE_PRIVATE */ diff --git a/src/test/test_replay.c b/src/test/test_replay.c index a02c160..7a0f098 100644 --- a/src/test/test_replay.c +++ b/src/test/test_replay.c @@ -17,6 +17,20 @@ static const char *test_buffer = " occaecat cupidatat non proident, sunt in culpa qui officia deserunt" " mollit anim id est laborum."; +static const char *test_buffer_2 = + "At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis" + " praesentium voluptatum deleniti atque corrupti quos dolores et quas" + " molestias excepturi sint occaecati cupiditate non provident, similique" + " sunt in culpa qui officia deserunt mollitia animi, id est laborum et" + " dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio." + " Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil" + " impedit quo minus id quod maxime placeat facere possimus, omnis voluptas" + " assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut" + " officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates" + " repudiandae sint et molestiae non recusandae. Itaque earum rerum hic" + " tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias" + " consequatur aut perferendis doloribus asperiores repellat."; + static void test_replaycache_alloc(void *arg) { @@ -83,6 +97,12 @@ test_replaycache_miss(void *arg) strlen(test_buffer), NULL); tt_int_op(result,OP_EQ, 0); + /* make sure a different buffer misses as well */ + result = + replaycache_add_and_test_internal(1200, NULL, test_buffer_2, + strlen(test_buffer_2), NULL); + tt_int_op(result,OP_EQ, 0); + /* poke the bad-parameter error case too */ result = replaycache_add_and_test_internal(1200, NULL, test_buffer, @@ -115,6 +135,18 @@ test_replaycache_hit(void *arg) strlen(test_buffer), NULL); tt_int_op(result,OP_EQ, 1); + /* make sure a different buffer misses then hits as well */ + + result = + replaycache_add_and_test_internal(1200, r, test_buffer_2, + strlen(test_buffer_2), NULL); + tt_int_op(result,OP_EQ, 0); + + result = + replaycache_add_and_test_internal(1300, r, test_buffer_2, + strlen(test_buffer_2), NULL); + tt_int_op(result,OP_EQ, 1); + done: if (r) replaycache_free(r); @@ -245,7 +277,7 @@ test_replaycache_scrub(void *arg) /* Make sure we hit the aging-out case too */ replaycache_scrub_if_needed_internal(1500, r); /* Assert that we aged it */ - tt_int_op(digestmap_size(r->digests_seen),OP_EQ, 0); + tt_int_op(digest256map_size(r->digests_seen),OP_EQ, 0); done: if (r) replaycache_free(r);

1 0

[tor/master] Merge remote-tracking branch 'teor/feature8961-replaycache-sha256'
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 2079ec9ee62e34fd46a12a7bba87a71df167d7ee Merge: be30c61 2e9779e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 08:55:18 2015 -0500 Merge remote-tracking branch 'teor/feature8961-replaycache-sha256' changes/feature8961-replaycache-sha256 | 4 ++++ src/or/replaycache.c | 26 ++++++++++++------------ src/or/replaycache.h | 2 +- src/test/test_replay.c | 34 +++++++++++++++++++++++++++++++- 4 files changed, 51 insertions(+), 15 deletions(-)

1 0

[tor/master] Fix: use the right list in find_expiring_intro_point()
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 273b267fa234c5a26c9beaacede42a496c880e05 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Nov 23 09:02:54 2015 -0500 Fix: use the right list in find_expiring_intro_point() The wrong list was used when looking up expired intro points in a rend service object causing what we think could be reachability issues and triggering a BUG log. Fixes #16702 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug16702 | 4 ++++ src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug16702 b/changes/bug16702 new file mode 100644 index 0000000..5de36cd --- /dev/null +++ b/changes/bug16702 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service) + - The wrong list was used when looking up expired intro points in a rend + service object causing what we think could be reachability issues and + triggering a BUG log. Fixes 16702; bugfix on tor-0.2.7.2-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8ba5327..77d8b71 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3038,7 +3038,8 @@ find_expiring_intro_point(rend_service_t *service, origin_circuit_t *circ) tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO || TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_INTRO); - SMARTLIST_FOREACH(service->intro_nodes, rend_intro_point_t *, intro_point, + SMARTLIST_FOREACH(service->expiring_nodes, rend_intro_point_t *, + intro_point, if (crypto_pk_eq_keys(intro_point->intro_key, circ->intro_key)) { return intro_point; });

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit be30c61ac1553cf4401c832019e213be907c0711 Merge: 6cdd024 273b267 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 25 08:53:46 2015 -0500 Merge branch 'maint-0.2.7' changes/bug16702 | 4 ++++ src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Fix: use the right list in find_expiring_intro_point()
by nickm＠torproject.org 25 Nov '15

25 Nov '15

commit 273b267fa234c5a26c9beaacede42a496c880e05 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Nov 23 09:02:54 2015 -0500 Fix: use the right list in find_expiring_intro_point() The wrong list was used when looking up expired intro points in a rend service object causing what we think could be reachability issues and triggering a BUG log. Fixes #16702 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug16702 | 4 ++++ src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug16702 b/changes/bug16702 new file mode 100644 index 0000000..5de36cd --- /dev/null +++ b/changes/bug16702 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service) + - The wrong list was used when looking up expired intro points in a rend + service object causing what we think could be reachability issues and + triggering a BUG log. Fixes 16702; bugfix on tor-0.2.7.2-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8ba5327..77d8b71 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3038,7 +3038,8 @@ find_expiring_intro_point(rend_service_t *service, origin_circuit_t *circ) tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO || TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_INTRO); - SMARTLIST_FOREACH(service->intro_nodes, rend_intro_point_t *, intro_point, + SMARTLIST_FOREACH(service->expiring_nodes, rend_intro_point_t *, + intro_point, if (crypto_pk_eq_keys(intro_point->intro_key, circ->intro_key)) { return intro_point; });

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 25 Nov '15

25 Nov '15

commit 77047490d3b7b06c3d1f2bb852eb8963c72598d9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 25 13:45:03 2015 +0000 Update translations for bridgedb --- th/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po index 44fea4c..71af3d9 100644 --- a/th/LC_MESSAGES/bridgedb.po +++ b/th/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-18 01:40+0000\n" +"PO-Revision-Date: 2015-11-25 13:40+0000\n" "Last-Translator: Ella Rudland <atwwtkp(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -235,7 +235,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "มีบริดจฺบางอันที่มีหมายเลข IPv6 ด้วย แม้ว่า Pluggable\nTransports บางส่วนไม่สามารถทำงานร่วมกับ IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -253,7 +253,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "สะพานหมายถึงอะไร" +msgstr "บริดจ์คืออะไร?" #: bridgedb/strings.py:102 #, python-format

1 0

[webwml/master] Fix links in donate page header
by sebastian＠torproject.org 25 Nov '15

25 Nov '15

commit 9ecd1937383fb4a80c9896cae7e8b174a8cf23b2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 25 11:10:02 2015 +0100 Fix links in donate page header --- include/donatehead.wmi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 616c461..d0c20a4 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -62,9 +62,9 @@ <div class="container"> <img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project"> <ul class="nav navbar-nav navbar-right" style="margin-top:50px; "> - <li><a href="">Home</a></li> - <li><a href="">About</a></li> - <li><a href="">Contact</a></li> + <li><a href="<page index>">Home</a></li> + <li><a href="<page about/overview>">About</a></li> + <li><a href="<page about/contact>">Contact</a></li> </ul> <hr style="margin-top:0;"> </div>

1 0