March 2017 - tor-commits - lists.torproject.org

[tor/master] Improve keccak-tiny performance by 15% on LE intel
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 9014dc111a46ae7e9443eb4f41969cfc20e79acc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 14:20:15 2017 -0400 Improve keccak-tiny performance by 15% on LE intel The 64-bit load and store code was generating pretty bad output with my compiler, so I extracted the code from csiphash and used that instead. Close ticket 21737 --- changes/faster-keccak | 4 ++ src/ext/byteorder.h | 67 ++++++++++++++++++++++++++++++ src/ext/csiphash.c | 36 +--------------- src/ext/include.am | 1 + src/ext/keccak-tiny/keccak-tiny-unrolled.c | 19 +++------ 5 files changed, 79 insertions(+), 48 deletions(-) diff --git a/changes/faster-keccak b/changes/faster-keccak new file mode 100644 index 0000000..45fc152 --- /dev/null +++ b/changes/faster-keccak @@ -0,0 +1,4 @@ + o Minor features (performance): + - The minimal keccak implementation we include now accesses memory + more efficiently, especially on little-endian systems. + Closes ticket 21737. diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h new file mode 100644 index 0000000..c8ba521 --- /dev/null +++ b/src/ext/byteorder.h @@ -0,0 +1,67 @@ +/* <MIT License> + Copyright (c) 2013-2014 Marek Majkowski <marek(a)popcount.org> + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + </MIT License> + + Original location: + https://github.com/majek/csiphash/ + + Solution inspired by code from: + Samuel Neves (supercop/crypto_auth/siphash24/little) + djb (supercop/crypto_auth/siphash24/little2) + Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) +*/ + +/* This code is extracted from csiphash.h */ + +#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ + __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +# define _le64toh(x) ((uint64_t)(x)) +#elif defined(_WIN32) +/* Windows is always little endian, unless you're on xbox360 + http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx */ +# define _le64toh(x) ((uint64_t)(x)) +#elif defined(__APPLE__) +# include <libkern/OSByteOrder.h> +# define _le64toh(x) OSSwapLittleToHostInt64(x) +#elif defined(sun) || defined(__sun) +# include <sys/byteorder.h> +# define _le64toh(x) LE_64(x) + +#else + +/* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) +# include <sys/endian.h> +# else +# include <endian.h> +# endif +# if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ + __BYTE_ORDER == __LITTLE_ENDIAN +# define _le64toh(x) ((uint64_t)(x)) +# else +# if defined(OpenBSD) +# define _le64toh(x) letoh64(x) +# else +# define _le64toh(x) le64toh(x) +# endif +# endif + +#endif diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 8348c66..1029bbb 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -35,41 +35,7 @@ #include "util.h" /* for memcpy */ #include <string.h> - -#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ - __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -# define _le64toh(x) ((uint64_t)(x)) -#elif defined(_WIN32) -/* Windows is always little endian, unless you're on xbox360 - http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx */ -# define _le64toh(x) ((uint64_t)(x)) -#elif defined(__APPLE__) -# include <libkern/OSByteOrder.h> -# define _le64toh(x) OSSwapLittleToHostInt64(x) -#elif defined(sun) || defined(__sun) -# include <sys/byteorder.h> -# define _le64toh(x) LE_64(x) - -#else - -/* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) -# include <sys/endian.h> -# else -# include <endian.h> -# endif -# if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ - __BYTE_ORDER == __LITTLE_ENDIAN -# define _le64toh(x) ((uint64_t)(x)) -# else -# if defined(OpenBSD) -# define _le64toh(x) letoh64(x) -# else -# define _le64toh(x) le64toh(x) -# endif -# endif - -#endif +#include "byteorder.h" #define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) diff --git a/src/ext/include.am b/src/ext/include.am index f00f3e0..c18e588 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -5,6 +5,7 @@ EXTRA_DIST += src/ext/README EXTHEADERS = \ src/ext/ht.h \ + src/ext/byteorder.h \ src/ext/tinytest.h \ src/ext/tor_readpassphrase.h \ src/ext/strlcat.c \ diff --git a/src/ext/keccak-tiny/keccak-tiny-unrolled.c b/src/ext/keccak-tiny/keccak-tiny-unrolled.c index d1342c3..d8d7fe3 100644 --- a/src/ext/keccak-tiny/keccak-tiny-unrolled.c +++ b/src/ext/keccak-tiny/keccak-tiny-unrolled.c @@ -10,28 +10,21 @@ #include <string.h> #include "crypto.h" +#include "byteorder.h" /******** Endianness conversion helpers ********/ static inline uint64_t loadu64le(const unsigned char *x) { - uint64_t r = 0; - size_t i; - - for (i = 0; i < 8; ++i) { - r |= (uint64_t)x[i] << 8 * i; - } - return r; + uint64_t r; + memcpy(&r, x, sizeof(r)); + return _le64toh(r); } static inline void storeu64le(uint8_t *x, uint64_t u) { - size_t i; - - for(i=0; i<8; ++i) { - x[i] = u; - u >>= 8; - } + uint64_t val = _le64toh(u); + memcpy(x, &val, sizeof(u)); } /******** The Keccak-f[1600] permutation ********/

1 0

[tor/master] Merge branch 'keccak-load-faster'
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 31c9bdadbe3ac4d2b7aa8d8036ccf10643b986f8 Merge: 8083e7c 9014dc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 19:47:38 2017 -0400 Merge branch 'keccak-load-faster' changes/faster-keccak | 4 ++ src/ext/byteorder.h | 67 ++++++++++++++++++++++++++++++ src/ext/csiphash.c | 36 +--------------- src/ext/include.am | 1 + src/ext/keccak-tiny/keccak-tiny-unrolled.c | 19 +++------ 5 files changed, 79 insertions(+), 48 deletions(-)

1 0

[tor/master] Note that bandwidth-limit options only affect TCP data.
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 8083e7c80bb2efb659207e9ce827a42552dc901c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 14 19:46:57 2017 -0400 Note that bandwidth-limit options only affect TCP data. --- changes/bug17170 | 3 +++ doc/tor.1.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/changes/bug17170 b/changes/bug17170 new file mode 100644 index 0000000..24a9b94 --- /dev/null +++ b/changes/bug17170 @@ -0,0 +1,3 @@ + o Documentation: + - Note that bandwidth-limiting options don't affect TCP headers or DNS. + Closes ticket 17170. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1665cfe..2f8d7bd 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -185,6 +185,9 @@ GENERAL OPTIONS course, more is better; we recommend at least 250 KBytes (2 mbits) if possible. (Default: 1 GByte) + + + Note that this option, and other bandwidth-limiting options, apply to TCP + data only: They do not count TCP headers or DNS traffic. + + + With this option, and in other options that take arguments in bytes, KBytes, and so on, other formats are also supported. Notably, "KBytes" can also be written as "kilobytes" or "kb"; "MBytes" can be written as

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 14 Mar '17

14 Mar '17

commit bb0263ff086b43d8a642e5ed2c241e02abd1a751 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 14 23:46:13 2017 +0000 Update translations for tails-misc --- sv.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index 9cdbff7..eb7c7d5 100644 --- a/sv.po +++ b/sv.po @@ -8,6 +8,7 @@ # Emil Johansson <emil.a.johansson(a)gmail.com>, 2015 # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Gabor Sebastiani, 2014 +# Henrik Mattsson-Mårn <h(a)reglage.net>, 2017 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 # pilino1234 <mhilgendrf(a)aol.com>, 2016 # Michael Cavén, 2014 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-07 09:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-03-14 23:35+0000\n" +"Last-Translator: Henrik Mattsson-Mårn <h(a)reglage.net>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,11 +110,11 @@ msgstr "Stäng av" #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:59 msgid "Warning: Tails 3.0 won't work on this computer!" -msgstr "" +msgstr "Varning: Tails 3.0 kommer inte att fungera på denna dator!" #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:60 msgid "Tails 3.0 will require a 64-bit processor." -msgstr "" +msgstr "Tails 3.0 kommer kräva en 64-bitars processor." #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:63 #: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:59

1 0

[support-portal/master] More wording changes
by colin＠torproject.org 14 Mar '17

14 Mar '17

commit 9e414ba46ca82aac3194fb38dd085a9ca6f33485 Author: Colin Childs <colin(a)torproject.org> Date: Tue Mar 14 16:38:55 2017 -0500 More wording changes --- plain/torbrowserfaq.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plain/torbrowserfaq.txt b/plain/torbrowserfaq.txt index 334386e..71e6058 100644 --- a/plain/torbrowserfaq.txt +++ b/plain/torbrowserfaq.txt @@ -86,7 +86,7 @@ Settings”, then “Copy Tor Log To Clipboard”. Q. Why is the Tor Browser slower than my other browsers? -A. Using Tor / the Tor Browser can sometimes be slower than directly connecting to services. This is due to your traffic being routed through 3 (or more if using onion services) relays around the world, before going to your destination. The Tor network has over a million daily users, and just over 6000 relays to route all of their traffic. The geographical distance and the load on each server make Tor a bit slower than what you may be used to. +A. Using Tor / the Tor Browser can sometimes be slower than directly connecting to services. The difference in speed is due to your traffic being routed through 3 (or more if using onion services) relays around the world, before going to your destination. The Tor network has over a million daily users, and just over 6000 relays to route all of their traffic. The geographical distance and the load on each server make Tor a bit slower than what you may be used to. However, the Tor network has become much faster over the last few years and this may not be noticable for many types of uses.

1 0

[support-portal/master] Fixing entry based on feedback
by colin＠torproject.org 14 Mar '17

14 Mar '17

commit 6f58aba179fce168edb0465fa213cc9a2ff10431 Author: Colin Childs <colin(a)torproject.org> Date: Tue Mar 14 16:34:23 2017 -0500 Fixing entry based on feedback --- plain/torbrowserfaq.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plain/torbrowserfaq.txt b/plain/torbrowserfaq.txt index 36dba8e..334386e 100644 --- a/plain/torbrowserfaq.txt +++ b/plain/torbrowserfaq.txt @@ -86,5 +86,7 @@ Settings”, then “Copy Tor Log To Clipboard”. Q. Why is the Tor Browser slower than my other browsers? -A. Using Tor / the Tor Browser can sometimes be slower than directly connecting to services. This is due to your traffic being routed through 3 (or more if using onion services) relays around the world, before going to your destination. However, the Tor network has become much faster over the last few years and this may not be noticable for many types of uses. +A. Using Tor / the Tor Browser can sometimes be slower than directly connecting to services. This is due to your traffic being routed through 3 (or more if using onion services) relays around the world, before going to your destination. The Tor network has over a million daily users, and just over 6000 relays to route all of their traffic. The geographical distance and the load on each server make Tor a bit slower than what you may be used to. + +However, the Tor network has become much faster over the last few years and this may not be noticable for many types of uses.

1 0

[support-portal/master] Pushing Phoul's first set of Tor Browser FAQ entries
by colin＠torproject.org 14 Mar '17

14 Mar '17

commit 4604478dcf5cdbba087c193c2171fc8985c20c24 Author: Colin Childs <colin(a)torproject.org> Date: Tue Mar 14 15:59:55 2017 -0500 Pushing Phoul's first set of Tor Browser FAQ entries --- plain/torbrowserfaq.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/plain/torbrowserfaq.txt b/plain/torbrowserfaq.txt index 8a14b4c..36dba8e 100644 --- a/plain/torbrowserfaq.txt +++ b/plain/torbrowserfaq.txt @@ -56,5 +56,35 @@ Q. Can I install a new add-on or extension in Tor Browser, like AdBlock Plus or A.It's strongly discouraged to install new add-ons in Tor Browser, because they can compromise both your privacy and your security. Plus, Tor Browser already comes installed with two add-ons - HTTPS Everywhere and NoScript -- which give you a lot of added protection. +Q. Can I pick which country I'm exiting from? +A. Modifying the way that Tor creates its circuits is strongly discouraged. You get the best security that Tor can provide when you leave the route selection to Tor; overriding the entry / exit nodes can compromise your anonymity. + +Q. Is there support for *BSD? + +A. Sorry, but there is currently no official support for running the Tor Browser on *BSD. + +Q. Where can I get bridges? + +A. https://tb-manual.torproject.org/en-US/bridges.html + +Q. Tor Browser's message log says my clock is wrong and wont connect + +A. Please make sure your system clock and timezone are set accurately. This error appears when the clock has drifted further than Tor is comfortable with. + +Q. How do I view the Tor Browser message log? + +A. +* click the button labelled “Copy Tor Log To Clipboard” that appears in +the dialog window while Tor Browser is connecting to the network. + +or + +* if Tor Browser is already open, click on the Torbutton icon (the +small green onion at the top-left of the screen), then “Open Network +Settings”, then “Copy Tor Log To Clipboard”. + +Q. Why is the Tor Browser slower than my other browsers? + +A. Using Tor / the Tor Browser can sometimes be slower than directly connecting to services. This is due to your traffic being routed through 3 (or more if using onion services) relays around the world, before going to your destination. However, the Tor network has become much faster over the last few years and this may not be noticable for many types of uses.

1 0

[tor/master] Log more info when a service descriptor has the wrong number of intro points
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit c99d0e742adbe878d8126a49573e83462a61742e Author: teor <teor2345(a)gmail.com> Date: Sat Mar 4 22:44:21 2017 +1100 Log more info when a service descriptor has the wrong number of intro points Depends on 21598, part of 21622. --- src/or/rendservice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8f978d0..2b7c6bf 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1134,7 +1134,8 @@ rend_service_update_descriptor(rend_service_t *service) "descriptor was updated with %d instead.", service->service_id, service->n_intro_points_wanted, have_intro); - rend_service_dump_stats(severity); + /* Now log an informative message about how we might have got here. */ + rend_log_intro_limit(service, severity); } }

1 0

[tor/master] Changes file for feature 21622
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit f1dd64bb00d4c755a9045e08a2a354fd453b79c8 Author: teor <teor2345(a)gmail.com> Date: Sat Mar 4 22:57:13 2017 +1100 Changes file for feature 21622 --- changes/feature21622 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/feature21622 b/changes/feature21622 new file mode 100644 index 0000000..163b90b --- /dev/null +++ b/changes/feature21622 @@ -0,0 +1,8 @@ + o Minor feature (hidden services): + - Log a message when a hidden service reaches its introduction point + circuit limit, and when that limit is reset. + Follow up to ticket 21594, closes ticket 21622. + - Add more information to the message logged when a hidden service + descriptor has fewer introduction points than specified in + HiddenServiceNumIntroductionPoints. + Follow up to tickets 21598 and 21599, closes ticket 21622.

1 0

[tor/master] Log info about intro point limits when they are reached and reset
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit c34411d9cb1c264ad5ccc149ea07f1fdc826010a Author: teor <teor2345(a)gmail.com> Date: Sat Mar 4 22:46:19 2017 +1100 Log info about intro point limits when they are reached and reset Depends on 21594, part of 21622. --- src/or/rendservice.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2b7c6bf..82e3137 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -4136,8 +4136,12 @@ rend_consider_services_intro_points(void) /* This retry period is important here so we don't stress circuit * creation. */ + if (now > service->intro_period_started + INTRO_CIRC_RETRY_PERIOD) { - /* One period has elapsed; we can try building circuits again. */ + /* One period has elapsed: + * - if we stopped, we can try building circuits again, + * - if we haven't, we reset the circuit creation counts. */ + rend_log_intro_limit(service, LOG_INFO); service->intro_period_started = now; service->n_intro_circuits_launched = 0; } else if (service->n_intro_circuits_launched >= @@ -4145,6 +4149,7 @@ rend_consider_services_intro_points(void) service->n_intro_points_wanted)) { /* We have failed too many times in this period; wait for the next * one before we try to initiate any more connections. */ + rend_log_intro_limit(service, LOG_WARN); continue; }

1 0