May 2016 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 May '16

05 May '16

commit aaa7768c3f982d65b94516e5381c2d919ec22243 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 15:45:42 2016 +0000 Update translations for tails-misc --- de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index e3749bd..0273344 100644 --- a/de.po +++ b/de.po @@ -9,7 +9,7 @@ # trantor <clucko3(a)gmail.com>, 2014 # DoKnGH26" 21 <dokngh2621(a)gmail.com>, 2015 # D P, 2015 -# Ettore Atalan <atalanttore(a)googlemail.com>, 2014-2015 +# Ettore Atalan <atalanttore(a)googlemail.com>, 2014-2016 # gerhard <listmember(a)rinnberger.de>, 2013 # konstibae, 2015 # Larson März <larson(a)protonmail.ch>, 2013 @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-05-05 15:19+0000\n" +"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -263,7 +263,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Wenn Sie Ihre E-Mails bereits auf Icedove migriert haben, sollten Sie Ihre kompletten <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>Claws Mail-Daten</a> löschen, um diese Warnung zu entfernen." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 05 May '16

05 May '16

commit 7236a4465f4686270612283f4bd2641b94918912 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 15:15:47 2016 +0000 Update translations for tails-misc_completed --- hu.po | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hu.po b/hu.po index c59415c..5665a36 100644 --- a/hu.po +++ b/hu.po @@ -4,6 +4,7 @@ # # Translators: # benewfy <benewfy(a)gmail.com>, 2015-2016 +# Falu, 2016 # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # iskr <iscreamd(a)gmail.com>, 2013 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Robert Zsolt <physx_ms(a)outlook.com>\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-05-05 15:14+0000\n" +"Last-Translator: Falu\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,13 +66,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Mindenképp el szeretné indítani az Electum-ot?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Indítás" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Kilépés" @@ -233,17 +234,24 @@ msgstr "GnuPG kimenet:" msgid "Other messages provided by GnuPG:" msgstr "Egyéb üzenetek a GnuPG-től:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "A Claws Mail perzisztencia aktiválva." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Ha vannak elmentett emailjei a Claws Mail-ben, akkor <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>másolja át az adatait</a> az Icedove indítása előtt." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Ha a levelezés migrálása Icedove-ra már megtörtént, akkor <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>minden Claws Mail adatod törlése</a> után ez a figyelmeztetés nem fog megjelenni." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Újraindítás"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 May '16

05 May '16

commit 7e476c6cad08fb69ff8e662957b5a6e86ba0ceac Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 5 15:15:44 2016 +0000 Update translations for tails-misc --- hu.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hu.po b/hu.po index 480cb8b..5665a36 100644 --- a/hu.po +++ b/hu.po @@ -4,6 +4,7 @@ # # Translators: # benewfy <benewfy(a)gmail.com>, 2015-2016 +# Falu, 2016 # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # iskr <iscreamd(a)gmail.com>, 2013 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-05-05 15:14+0000\n" +"Last-Translator: Falu\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +250,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Ha a levelezés migrálása Icedove-ra már megtörtént, akkor <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>minden Claws Mail adatod törlése</a> után ez a figyelmeztetés nem fog megjelenni." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[tor/release-0.2.8] (cherry-picked by nickm, with changes file from isis.)
by nickm＠torproject.org 05 May '16

05 May '16

commit 054d9398531b148d8b41c382da36c83c0381e09e Author: s0rlxmh0 <s6yg1ez3(a)mail2tor.com> Date: Mon May 2 14:01:36 2016 -0400 (cherry-picked by nickm, with changes file from isis.) --- changes/bug18920 | 5 +++++ src/or/control.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug18920 b/changes/bug18920 new file mode 100644 index 0000000..1babfd6 --- /dev/null +++ b/changes/bug18920 @@ -0,0 +1,5 @@ + o Minor bugfixes (controller, microdescriptors): + - Make GETINFO dir/status-vote/current/consensus conform to the control + specification by returning "551 Could not open cached consensus..." + when not caching consensuses. + Fixes bug 18920; bugfix on 0.2.2.6-alpha. diff --git a/src/or/control.c b/src/or/control.c index 655b4dd..e06d7d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2011,6 +2011,11 @@ getinfo_helper_dir(control_connection_t *control_conn, char *filename = get_datadir_fname("cached-consensus"); *answer = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL); tor_free(filename); + if (!*answer) { /* generate an error */ + *errmsg = "Could not open cached consensus. " + "Make sure FetchUselessDescriptors is set to 1."; + return -1; + } } } else if (!strcmp(question, "network-status")) { /* v1 */ routerlist_t *routerlist = router_get_routerlist();

1 0

[tor/release-0.2.8] Do not recommend use of nicknames in MapAddress manpage
by nickm＠torproject.org 05 May '16

05 May '16

commit 92615f608c2fd1b5da29068498c5fe473105e88f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 20:30:59 2016 -0400 Do not recommend use of nicknames in MapAddress manpage --- changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug18312 b/changes/bug18312 new file mode 100644 index 0000000..7dcb326 --- /dev/null +++ b/changes/bug18312 @@ -0,0 +1,4 @@ + o Documentation: + - Stop recommending use of nicknames to identify relays in our + MapAddress documentation. Closes ticket 18312. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 262a36e..787223d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -961,12 +961,12 @@ The following options are useful only for clients (that is, if When a request for address arrives to Tor, it will transform to newaddress before processing it. For example, if you always want connections to www.example.com to exit via __torserver__ (where __torserver__ is the - nickname of the server), use "MapAddress www.example.com + fingerprint of the server), use "MapAddress www.example.com www.example.com.torserver.exit". If the value is prefixed with a "\*.", matches an entire domain. For example, if you always want connections to example.com and any if its subdomains to exit via - __torserver__ (where __torserver__ is the nickname of the server), use + __torserver__ (where __torserver__ is the fingerprint of the server), use "MapAddress \*.example.com \*.example.com.torserver.exit". (Note the leading "*." in each part of the directive.) You can also redirect all subdomains of a domain to a single address. For example, "MapAddress

1 0

[tor/release-0.2.8] Fix dnsserv.c assertion when no supported questions are requested.
by nickm＠torproject.org 05 May '16

05 May '16

commit 0ca3f495c6fad074606ab75942b64738ed61926a Author: Scott Dial <scott(a)scottdial.com> Date: Wed May 4 14:45:09 2016 -0400 Fix dnsserv.c assertion when no supported questions are requested. The problem is that "q" is always set on the first iteration even if the question is not a supported question. This set of "q" is not necessary, and will be handled after exiting the loop if there if a supported q->type was found. [Changes file by nickm] lease enter the commit message for your changes. Lines starting --- changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug18710 b/changes/bug18710 new file mode 100644 index 0000000..2693955 --- /dev/null +++ b/changes/bug18710 @@ -0,0 +1,6 @@ + o Major bugfixes (DNS proxy): + - Stop a crash that could occur when a client running with DNSPort + received a query with multiple address types, where the first + address type was not supported. Found and fixed by Scott Dial. + Fixes bug 18710; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index ecd45be..9b0368d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -87,8 +87,6 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) for (i = 0; i < req->nquestions; ++i) { if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET) continue; - if (! q) - q = req->questions[i]; switch (req->questions[i]->type) { case EVDNS_TYPE_A: case EVDNS_TYPE_AAAA: @@ -96,7 +94,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) /* We always pick the first one of these questions, if there is one. */ if (! supported_q) - supported_q = q; + supported_q = req->questions[i]; break; default: break;

1 0

[tor/release-0.2.8] Fix keccak-tiny portability on `exotic` platforms.
by nickm＠torproject.org 05 May '16

05 May '16

commit 8f292f1c33b033f36e17969f206c9332c0241e9a Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon May 2 10:24:35 2016 +0000 Fix keccak-tiny portability on `exotic` platforms. * SHA-3/SHAKE use little endian for certain things, so byteswap as needed. * The code was written under the assumption that unaligned access to quadwords is allowed, which isn't true particularly on non-Intel. --- changes/bug18943 | 6 +++ src/ext/keccak-tiny/keccak-tiny-unrolled.c | 72 +++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/changes/bug18943 b/changes/bug18943 new file mode 100644 index 0000000..53569f0 --- /dev/null +++ b/changes/bug18943 @@ -0,0 +1,6 @@ + o Major bugfixes (crypto, portability): + - The SHA3 and SHAKE routines now produce the correct output on + Big Endian systems, unbreaking the unit tests. No code calls + either algorithm family yet, so this is primarily a build fix. + Closes ticket 18943. + diff --git a/src/ext/keccak-tiny/keccak-tiny-unrolled.c b/src/ext/keccak-tiny/keccak-tiny-unrolled.c index 4b4f51c..d1342c3 100644 --- a/src/ext/keccak-tiny/keccak-tiny-unrolled.c +++ b/src/ext/keccak-tiny/keccak-tiny-unrolled.c @@ -11,6 +11,29 @@ #include <string.h> #include "crypto.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; +} + +static inline void +storeu64le(uint8_t *x, uint64_t u) { + size_t i; + + for(i=0; i<8; ++i) { + x[i] = u; + u >>= 8; + } +} + /******** The Keccak-f[1600] permutation ********/ /*** Constants. ***/ @@ -80,24 +103,26 @@ static inline void keccakf(void* state) { /*** Some helper macros. ***/ -#define _(S) do { S } while (0) -#define FOR(i, ST, L, S) \ - _(for (size_t i = 0; i < L; i += ST) { S; }) -#define mkapply_ds(NAME, S) \ - static inline void NAME(uint8_t* dst, \ - const uint8_t* src, \ - size_t len) { \ - FOR(i, 1, len, S); \ - } -#define mkapply_sd(NAME, S) \ - static inline void NAME(const uint8_t* src, \ - uint8_t* dst, \ - size_t len) { \ - FOR(i, 1, len, S); \ +// `xorin` modified to handle Big Endian systems, `buf` being unaligned on +// systems that care about such things. Assumes that len is a multiple of 8, +// which is always true for the rates we use, and the modified finalize. +static inline void +xorin8(uint8_t *dst, const uint8_t *src, size_t len) { + uint64_t* a = (uint64_t*)dst; // Always aligned. + for (size_t i = 0; i < len; i += 8) { + a[i/8] ^= loadu64le(src + i); } +} -mkapply_ds(xorin, dst[i] ^= src[i]) // xorin -mkapply_sd(setout, dst[i] = src[i]) // setout +// `setout` likewise modified to handle Big Endian systems. Assumes that len +// is a multiple of 8, which is true for every rate we use. +static inline void +setout8(const uint8_t *src, uint8_t *dst, size_t len) { + const uint64_t *si = (const uint64_t*)src; // Always aligned. + for (size_t i = 0; i < len; i+= 8) { + storeu64le(dst+i, si[i/8]); + } +} #define P keccakf #define Plen KECCAK_MAX_RATE @@ -118,7 +143,7 @@ static inline void keccak_absorb_blocks(keccak_state *s, const uint8_t *buf, size_t nr_blocks) { size_t blen = nr_blocks * s->rate; - foldP(buf, blen, xorin); + foldP(buf, blen, xorin8); } static int @@ -161,10 +186,14 @@ static void keccak_finalize(keccak_state *s) { // Xor in the DS and pad frame. - s->a[s->offset] ^= s->delim; - s->a[s->rate - 1] ^= 0x80; + s->block[s->offset++] = s->delim; // DS. + for (size_t i = s->offset; i < s->rate; i++) { + s->block[i] = 0; + } + s->block[s->rate - 1] |= 0x80; // Pad frame. + // Xor in the last block. - xorin(s->a, s->block, s->offset); + xorin8(s->a, s->block, s->rate); memwipe(s->block, 0, sizeof(s->block)); s->finalized = 1; @@ -176,7 +205,7 @@ keccak_squeeze_blocks(keccak_state *s, uint8_t *out, size_t nr_blocks) { for (size_t n = 0; n < nr_blocks; n++) { keccakf(s->a); - setout(s->a, out, s->rate); + setout8(s->a, out, s->rate); out += s->rate; } } @@ -321,6 +350,7 @@ static inline int hash(uint8_t* out, size_t outlen, int ret = 0; keccak_state s; + keccak_cleanse(&s); switch (delim) { case KECCAK_DELIM_DIGEST:

1 0

[tor/release-0.2.8] Merge branch 'bug18710_025' into maint-0.2.8
by nickm＠torproject.org 05 May '16

05 May '16

commit 31332a878db0d8f8d53fe4e535ec9ae812675315 Merge: 8f292f1 0ca3f49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 14:47:04 2016 -0400 Merge branch 'bug18710_025' into maint-0.2.8 changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] Report success when not terminating an already terminated process.
by nickm＠torproject.org 05 May '16

05 May '16

commit c7b9e0b8ed7076525da185e25c2142b18b4d43e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:10:36 2016 -0400 Report success when not terminating an already terminated process. Also, document the actual behavior and return values of tor_terminate_process. Fixes bug18686; bugfix on 0.2.3.9-alpha. --- changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug18686 b/changes/bug18686 new file mode 100644 index 0000000..23547d2 --- /dev/null +++ b/changes/bug18686 @@ -0,0 +1,5 @@ + o Minor bugfixes (pluggable transports): + - Avoid reporting a spurious error when we decide that we don't + need to terminate a pluggable transport because it has already + exited. Fixes bug 18686; bugfix on 0.2.5.5-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 04cc6b1..65af8a6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3626,8 +3626,13 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, /* Maximum number of file descriptors, if we cannot get it via sysconf() */ #define DEFAULT_MAX_FD 256 -/** Terminate the process of process_handle. - * Code borrowed from Python's os.kill. */ +/** Terminate the process of process_handle, if that process has not + * already exited. + * + * Return 0 if we succeeded in terminating the process (or if the process + * already exited), and -1 if we tried to kill the process but failed. + * + * Based on code originally borrowed from Python's os.kill. */ int tor_terminate_process(process_handle_t *process_handle) { @@ -3647,7 +3652,7 @@ tor_terminate_process(process_handle_t *process_handle) } #endif - return -1; + return 0; /* We didn't need to kill the process, so report success */ } /** Return the Process ID of process_handle. */

1 0

[tor/release-0.2.8] Merge branch 'bug18686_025' into maint-0.2.8
by nickm＠torproject.org 05 May '16

05 May '16

commit b8e8910d60e41844ce4ab37d9306cb8e8b5aec91 Merge: 31332a8 c7b9e0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 15:12:11 2016 -0400 Merge branch 'bug18686_025' into maint-0.2.8 changes/bug18686 | 5 +++++ src/common/util.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0