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

[user-manual/master] Fix "JavaScript" spelling errors
by colin＠torproject.org 13 Sep '16

13 Sep '16

commit 03eb3b0c4b6a622aa19d936e41c42c512a240ab3 Author: Colin Childs <colin(a)torproject.org> Date: Tue Sep 13 00:19:21 2016 -0500 Fix "JavaScript" spelling errors --- C/plugins.page | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C/plugins.page b/C/plugins.page index 8ea8222..5622657 100644 --- a/C/plugins.page +++ b/C/plugins.page @@ -3,11 +3,11 @@ id="plugins"> <info> - <desc>How Tor Browser handles add-ons, plugins and JavasScript</desc> + <desc>How Tor Browser handles add-ons, plugins and JavaScript</desc> <link type="guide" xref="index" group="#last" /> </info> -<title>Plugins, add-ons and JavasSript</title> +<title>Plugins, add-ons and JavaScript</title> <section id="flash"> <title>Flash Player</title>

1 0

[tor-browser-bundle/hardened-builds] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4023bc26f3a371dbdadc7659eb511c6d2a5b4d5c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 2db8739..4bbb8a4 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -35,7 +35,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -125,7 +124,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9296724..0286f58 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -24,7 +24,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -131,7 +130,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4e2d9e7d4a0e0485ee5a5654e98c7262b9e6c03c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0adcf5d..7093a0d 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,7 +32,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -97,7 +96,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 0876bff..9c31834 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -27,7 +27,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -137,7 +136,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor/master] Add some clarifications in the comments. Bug 19209
by nickm＠torproject.org 12 Sep '16

12 Sep '16

commit 87b91949f18f933ba810ec2083879f23041cd661 Author: Carolin Zöbelein <contact(a)carolin-zoebelein.de> Date: Sun Sep 11 01:30:02 2016 +0200 Add some clarifications in the comments. Bug 19209 --- src/config/torrc.minimal.in-staging | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 248cb5c..e68f265 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -98,6 +98,8 @@ # OutboundBindAddress 10.0.0.5 ## A handle for your relay, so people don't have to refer to it by key. +## Only alphanumeric characters, A-Z, a-z, 0-1 are allowed. No unicode, +## no emoji. #Nickname ididnteditheconfig ## Define these to limit how much relayed traffic you will allow. Your @@ -128,6 +130,7 @@ ## descriptors containing these lines and that Google indexes them, so ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. +## Notice that "<" and ">" are necessary. #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> @@ -149,8 +152,8 @@ ## Uncomment this if you run more than one Tor relay, and add the identity ## key fingerprint of each Tor relay you control, even if they're on -## different networks. You declare it here so Tor clients can avoid -## using more than one of your relays in a single circuit. See +## different networks. Include "$" with each key id. You declare it here so +## Tor clients can avoid using more than one of your relays in a single circuit. See ## https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address.

1 0

[tor/master] Merge remote-tracking branch 'samdney/ticket19209'
by nickm＠torproject.org 12 Sep '16

12 Sep '16

commit c897328feea549a391669c3fc93dc220d27e387c Merge: d5d29cd 87b9194 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 12 08:58:04 2016 -0400 Merge remote-tracking branch 'samdney/ticket19209' src/config/torrc.minimal.in-staging | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --cc src/config/torrc.minimal.in-staging index d4dfd5f,e68f265..5fa37c1 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@@ -98,8 -98,8 +98,9 @@@ # OutboundBindAddress 10.0.0.5 ## A handle for your relay, so people don't have to refer to it by key. -## Only alphanumeric characters, A-Z, a-z, 0-1 are allowed. No unicode, +## Nicknames must be between 1 and 19 characters inclusive, and must - ## contain only the characters [a-zA-Z0-9]. ++## contain only the alphanumeric characters (a-z, A-Z, 0-9). No unicode, + ## no emoji. #Nickname ididnteditheconfig ## Define these to limit how much relayed traffic you will allow. Your @@@ -130,9 -130,10 +131,12 @@@ ## descriptors containing these lines and that Google indexes them, so ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. -## Notice that "<" and ">" are necessary. ++## Notice that "<" and ">" are recommended. #ContactInfo Random Person <nobody AT example dot com> --## You might also include your PGP or GPG fingerprint if you have one: --#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> ++## You might also include your PGP or GPG fingerprint if you have one. ++## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy ++## to forge. ++#ContactInfo FFFFFFFFFFFFFFFFFFFF FFFFFFFFFFFFFFFFFFFF Random Person <nobody AT example dot com> ## Uncomment this to mirror directory information for others. Please do ## if you have enough bandwidth. @@@ -149,11 -150,11 +153,12 @@@ ## distribution for a sample. #DirPortFrontPage @CONFDIR@/tor-exit-notice.html --## Uncomment this if you run more than one Tor relay, and add the identity --## key fingerprint of each Tor relay you control, even if they're on - ## different networks. You declare it here so Tor clients can avoid - ## using more than one of your relays in a single circuit. See -## different networks. Include "$" with each key id. You declare it here so -## Tor clients can avoid using more than one of your relays in a single circuit. See --## https://www.torproject.org/docs/faq#MultipleRelays ++## Uncomment this if you run more than one Tor relay, and add the ++## identity key fingerprint of each Tor relay you control, even if ++## they're on different networks. Include "$" with each key id. You ++## declare it here so Tor clients can avoid using more than one of ++## your relays in a single circuit. ++## See https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. #MyFamily $keyid,$keyid,... @@@ -203,4 -204,4 +208,3 @@@ ## a private bridge, for example because you'll give out your bridge ## address manually to your friends, uncomment this line: #PublishServerDescriptor 0 --

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 12 Sep '16

12 Sep '16

commit 202e156a3b4692cfd7cbeb44e766fdb1ca2d753d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 12 07:48:06 2016 +0000 Update translations for tor-messenger-prefsdtd --- pl/prefs.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/prefs.dtd b/pl/prefs.dtd index a9b207e..60ba8fe 100644 --- a/pl/prefs.dtd +++ b/pl/prefs.dtd @@ -17,6 +17,6 @@ <!ENTITY prefs.coniksServerAddress "Adres serwera"> <!ENTITY prefs.coniksServerPort "Port"> <!ENTITY prefs.coniksAccountPolicy "Polityka konta"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> -<!ENTITY prefs.coniksPrivateLookups "Private lookups"> +<!ENTITY prefs.coniksPoliciesForAccount "Polityki dla konta:"> +<!ENTITY prefs.coniksPrivateLookups "Prywatne wyszukiwanie"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[tor/master] Whoops. Cant call sockaddr_in a "sin", since sin() is a thing.
by nickm＠torproject.org 11 Sep '16

11 Sep '16

commit d5d29cd5a2a0e09afb199f180619cf7a5172f7f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 11 17:59:25 2016 -0400 Whoops. Cant call sockaddr_in a "sin", since sin() is a thing. --- src/test/test_util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7d02fed..1edfaa9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5101,14 +5101,14 @@ is_there_a_localhost(void) s = tor_open_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); tor_assert(SOCKET_OK(s)); - struct sockaddr_in sin; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(0x7f000001); - sin.sin_port = 0; + struct sockaddr_in s_in; + memset(&s_in, 0, sizeof(s_in)); + s_in.sin_family = AF_INET; + s_in.sin_addr.s_addr = htonl(0x7f000001); + s_in.sin_port = 0; int result = 0; - if (bind(s, (void*)&sin, sizeof(sin)) == 0) { + if (bind(s, (void*)&s_in, sizeof(s_in)) == 0) { result = 1; } tor_close_socket(s);

1 0

[tor/master] Fix gmtime unit test on openbsd
by nickm＠torproject.org 11 Sep '16

11 Sep '16

commit ccea2a5aa92f3d6eae62877da8291a8c59d15adb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 11 17:43:20 2016 -0400 Fix gmtime unit test on openbsd openbsd helpfully handles gmtime() of INT64_MIN. Good job! Our tests didn't handle that so well. --- src/test/test_util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cb523cf..7d02fed 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -881,7 +881,11 @@ test_util_time(void *arg) b_time.tm_year == (1-1900))) { tt_int_op(b_time.tm_year, OP_EQ, 1970-1900); } - CHECK_TIMEGM_WARNING("Rounding up to "); + if (b_time.tm_year != 1970-1900) { + CHECK_TIMEGM_WARNING("Rounding up to "); + } else { + teardown_capture_of_logs(); + } } #endif

1 0

[tor/master] Tweak tor_gmtime_r test.
by nickm＠torproject.org 11 Sep '16

11 Sep '16

commit a671a1c9d632242662bf9fd8b37b63ccefd8a3bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 11 17:13:51 2016 -0400 Tweak tor_gmtime_r test. On openbsd64, I'm seeing a warning that the log isn't saying what I'd expect, but I'm not seeing what the answer actually _is_ here. --- src/test/test_util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 224ec7b..38f2302 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -877,9 +877,11 @@ test_util_time(void *arg) t_res = INT64_MIN; CAPTURE(); tor_gmtime_r(&t_res, &b_time); + if (! (b_time.tm_year == (1970-1900) || + b_time.tm_year == (1-1900))) { + tt_int_op(b_time.tm_year, OP_EQ, 1970-1900); + } CHECK_TIMEGM_WARNING("Rounding up to "); - tt_assert(b_time.tm_year == (1970-1900) || - b_time.tm_year == (1-1900)); } #endif

1 0

[tor/master] Try to make our ersatz-socketpair test work better on FreeBSD jails
by nickm＠torproject.org 11 Sep '16

11 Sep '16

commit c6e70dacb8e53f28b7e926de81edaf4b25b48848 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 11 17:28:29 2016 -0400 Try to make our ersatz-socketpair test work better on FreeBSD jails --- src/test/test_util.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 38f2302..cb523cf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5090,6 +5090,44 @@ test_util_socket(void *arg) tor_close_socket(fd4); } +static int +is_there_a_localhost(void) +{ + tor_socket_t s; + s = tor_open_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + tor_assert(SOCKET_OK(s)); + + struct sockaddr_in sin; + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = htonl(0x7f000001); + sin.sin_port = 0; + + int result = 0; + if (bind(s, (void*)&sin, sizeof(sin)) == 0) { + result = 1; + } + tor_close_socket(s); + if (result) + return result; + + s = tor_open_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + tor_assert(SOCKET_OK(s)); + + struct sockaddr_in6 sin6; + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_addr.s6_addr[15] = 1; + sin6.sin6_port = 0; + + if (bind(s, (void*)&sin6, sizeof(sin6)) == 0) { + result = 1; + } + tor_close_socket(s); + + return result; +} + /* Test for socketpair and ersatz_socketpair(). We test them both, since * the latter is a tolerably good way to exersize tor_accept_socket(). */ static void @@ -5108,10 +5146,10 @@ test_util_socketpair(void *arg) * Otherwise, we risk exposing a socketpair on a routable IP address. (Some * BSD jails use a routable address for localhost. Fortunately, they have * the real AF_UNIX socketpair.) */ - if (ersatz && ERRNO_IS_EPROTO(-socketpair_result)) { + if (ersatz && socketpair_result < 0 && !is_there_a_localhost()) { /* In my testing, an IPv6-only FreeBSD jail without ::1 returned EINVAL. * Assume we're on a machine without 127.0.0.1 or ::1 and give up now. */ - goto done; + tt_skip(); } tt_int_op(0, OP_EQ, socketpair_result);

1 0