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

[sandboxed-tor-browser/master] Add back the old release MAR signing key.
by yawning＠torproject.org 19 Apr '17

19 Apr '17

commit c9fc6212512761126edb874aee7e2ff0fecbd4f1 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Apr 19 20:40:39 2017 +0000 Add back the old release MAR signing key. You are in a maze of twisty public keys, all alike. When I pulled in the new MAR signing key (b32fb3a83a4fcc60cf05c0c41a7b7b67ada704cd not actually used yet), I should have preserved all existing keys, because they're all used for various things. In this case, the key that got obliterated is the one currently being used to sign MARs for the `release` channel. --- ChangeLog | 1 + data/installer/release_primary_6.5.der | Bin 0 -> 1229 bytes src/cmd/sandboxed-tor-browser/internal/installer/mar.go | 11 +++++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09740c4..a0f16bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.6 - UNRELEASED: + * Add back the old release MAR signing key. Changes in version 0.0.5 - 2017-04-13: * Bug 21764: Use bubblewrap's `--die-with-parent` when supported. diff --git a/data/installer/release_primary_6.5.der b/data/installer/release_primary_6.5.der new file mode 100644 index 0000000..542fb24 Binary files /dev/null and b/data/installer/release_primary_6.5.der differ diff --git a/src/cmd/sandboxed-tor-browser/internal/installer/mar.go b/src/cmd/sandboxed-tor-browser/internal/installer/mar.go index 3f9c610..60d114d 100644 --- a/src/cmd/sandboxed-tor-browser/internal/installer/mar.go +++ b/src/cmd/sandboxed-tor-browser/internal/installer/mar.go @@ -28,11 +28,6 @@ import ( "cmd/sandboxed-tor-browser/internal/data" ) -const ( - tbbMARReleasePrimaryAsset = "installer/release_primary.der" - tbbMARReleaseSecondaryAsset = "installer/release_secondary.der" -) - var tbbMARCerts []*x509.Certificate // VerifyTorBrowserMAR validates the MAR signature against the TBB MAR signing @@ -139,7 +134,11 @@ func VerifyTorBrowserMAR(mar []byte) error { } func init() { - assets := []string{tbbMARReleasePrimaryAsset, tbbMARReleaseSecondaryAsset} + assets := []string{ + "installer/release_primary_6.5.der", // Stable MAR signing key. + "installer/release_primary.der", // (Unused) MAR signing key. + "installer/release_secondary.der", // Alpha MAR signing key (7.0). + } for _, asset := range assets { if der, err := data.Asset(asset); err != nil {

1 0

[webwml/master] Add new Tor Browser version: 6.5.2
by boklm＠torproject.org 19 Apr '17

19 Apr '17

commit ed07a6fda97fae074ff70ff33b58cd40798e3c5a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 19 20:49:45 2017 +0200 Add new Tor Browser version: 6.5.2 --- include/versions.wmi | 22 +++++++++++----------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d23153c..59dd3d2 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,27 +4,27 @@ <define-tag version-win32-stable whitespace=delete>0.2.9.10</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.5</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>6.5.1</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>6.5.2</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a2</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>6.5.1</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2017-03-07</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>6.5.2</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>7.0a2</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-03-08</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>6.5.1</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-03-07</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>6.5.1</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-03-07</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>6.5.2</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-04-19</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>6.5.2</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a2</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-03-08</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a2</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-03-08</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>6.5.1</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-03-07</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>6.5.1</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-03-07</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>6.5.2</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-04-19</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>6.5.2</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a2</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-03-08</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.3</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 4a6eeab..bf79c79 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "6.5.1-Linux", "6.5.1-MacOS", "6.5.1-Windows", +"6.5.2", +"6.5.2-Linux", +"6.5.2-MacOS", +"6.5.2-Windows", "7.0a2", "7.0a2-Linux", "7.0a2-MacOS",

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 19 Apr '17

19 Apr '17

commit ea39c7fa1a11d8b104b55169146397eca76c9b00 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 19 16:15:46 2017 +0000 Update translations for torbirdy --- hy/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hy/torbirdy.dtd b/hy/torbirdy.dtd index 1c46644..26d357e 100644 --- a/hy/torbirdy.dtd +++ b/hy/torbirdy.dtd @@ -2,7 +2,7 @@ <!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup"> <!ENTITY torbirdy.accountprefs.startup.key "C"> <!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every"> -<!ENTITY torbirdy.accountprefs.minutes.key "d"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> <!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes"> <!ENTITY torbirdy.accountprefs.cancel.button "Cancel"> <!ENTITY torbirdy.accountprefs.save.button "Save">

1 0

[torspec/master] prop224: Be consistent with our concatenation symbol (|)
by dgoulet＠torproject.org 19 Apr '17

19 Apr '17

commit 8eee5024f66d4816d63b341550c01ba4ab059bfc Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 19 10:25:15 2017 -0400 prop224: Be consistent with our concatenation symbol (|) Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index b3fcf81..1c2f0fa 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -211,7 +211,7 @@ Table of contents: * Instantiate KDF with SHAKE-256. - * Instantiate MAC(key=k, message=m) with H(k_len || k || m), + * Instantiate MAC(key=k, message=m) with H(k_len | k | m), where k_len is htonll(len(k)). For legacy purposes, we specify compatibility with older versions of @@ -782,9 +782,9 @@ Table of contents: for replicanum in 1...hsdir_n_replicas: hs_index(replicanum) = H("store-at-idx" | - blinded_public_key | - INT_8(replicanum) | - INT_8(period_num) ) + blinded_public_key | + INT_8(replicanum) | + INT_8(period_num) ) where blinded_public_key is specified in section [KEYBLIND], and period_num is calculated using the current consensus "valid-after" as specified in @@ -1891,8 +1891,8 @@ Table of contents: version field and a basic checksum. All this information is then base32 encoded as shown below: - onion_address = base32(PUBKEY || CHECKSUM || VERSION) + ".onion" - CHECKSUM = H(".onion checksum" || PUBKEY || VERSION)[:2] + onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion" + CHECKSUM = H(".onion checksum" | PUBKEY | VERSION)[:2] where: - PUBKEY is the 32 bytes ed25519 master pubkey of the hidden service.

1 0

[torspec/master] prop224: Replace HMAC by a H construction
by dgoulet＠torproject.org 19 Apr '17

19 Apr '17

commit f7458b13e25fd8a61bdb922e2a750bb12ec3312c Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 19 10:23:17 2017 -0400 prop224: Replace HMAC by a H construction Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index d403343..b3fcf81 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -903,7 +903,7 @@ Table of contents: To do so, Tor clients and services use: - SRV = HMAC("shared-random-disaster", INT_8(period_num)) + SRV = H("shared-random-disaster" | INT_8(period_num)) where period_num is calculated as specified in [TIME-PERIODS] for the wanted shared random value that could not be found originally.

1 0

[torspec/master] prop224: Make ed25519 identity key mandatory for link specifiers
by dgoulet＠torproject.org 19 Apr '17

19 Apr '17

commit 9633331a0d254f1b9795a5139463587f0675189f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 19 09:53:11 2017 -0400 prop224: Make ed25519 identity key mandatory for link specifiers Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 2d6f261..c037ff8 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -237,7 +237,8 @@ Table of contents: Link specifier types are as described in tor-spec.txt. Every set of link specifiers MUST include at minimum specifiers of type [00] - (TLS-over-TCP, IPv4) and [02] (legacy node identity). + (TLS-over-TCP, IPv4), [02] (legacy node identity) and [03] (ed25519 + identity key). We also incorporate Tor's circuit extension handshakes, as used in the CREATE2 and CREATED2 cells described in tor-spec.txt. In these

1 0

[torspec/master] prop224: Use consistent notation of period_num
by dgoulet＠torproject.org 19 Apr '17

19 Apr '17

commit caa9353c7146fd0d8efb774eef951ed3ac4b526e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 19 09:58:21 2017 -0400 prop224: Use consistent notation of period_num Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index c037ff8..d403343 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -903,9 +903,10 @@ Table of contents: To do so, Tor clients and services use: - SRV = HMAC("shared-random-disaster", TIME_PERIOD_NUM) + SRV = HMAC("shared-random-disaster", INT_8(period_num)) - as the SRV for time period TIME_PERIOD_NUM. + where period_num is calculated as specified in [TIME-PERIODS] for the + wanted shared random value that could not be found originally. 2.3.2. Hidden services and changing shared random values

1 0

[tor-browser-bundle/master] Bug 19316: add support for minSupportedInstructionSet in config.yml
by gk＠torproject.org 19 Apr '17

19 Apr '17

commit 70961a33301ca42b1fe3eb9eee87ea16bef4fea2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 19 12:14:04 2017 +0200 Bug 19316: add support for minSupportedInstructionSet in config.yml --- tools/update-responses/update_responses | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b7f4b63..0ed19c1 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -292,6 +292,7 @@ sub get_response { goto CLOSETAGS; } my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + my $mininstruc = get_config($config, $version, $os, 'minSupportedInstructionSet'); $writer->startTag('update', type => 'minor', displayVersion => $version, @@ -302,6 +303,7 @@ sub get_response { actions => 'showURL', openURL => get_config($config, $version, $os, 'detailsURL'), defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), ); foreach my $patch (@patches) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch;

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 19 Apr '17

19 Apr '17

commit f3ec9a3327dd8ec032746f6f95a6ed5dad38af4f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 19 09:19:55 2017 +0000 Update translations for tor-browser-manual --- ko/ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/ko.po b/ko/ko.po index 2815dc0..0f4d366 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -1,5 +1,5 @@ # Translators: -# pCsOrI <pcsori(a)gmail.com>, 2016 +# 이피시소리 <pcsori(a)gmail.com>, 2016 # Sungjin Kang <potopro(a)gmail.com>, 2016 # cwt96 <cwt967(a)naver.com>, 2016 # 류종헌 <lptprjh(a)gmail.com>, 2016

1 0

[tor/master] missing smartlist_free in new consdiff test
by nickm＠torproject.org 18 Apr '17

18 Apr '17

commit b7dd3518b98a6473f78138f8abfdc3372f2339f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 18 22:56:34 2017 -0400 missing smartlist_free in new consdiff test --- src/test/test_consdiff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c index 9198616..a1a51ec 100644 --- a/src/test/test_consdiff.c +++ b/src/test/test_consdiff.c @@ -622,6 +622,8 @@ test_consdiff_gen_ed_diff(void *arg) tt_str_eq_line(".", smartlist_get(diff, 5)); tt_str_eq_line("2d", smartlist_get(diff, 6)); + smartlist_free(diff); + smartlist_clear(cons1); smartlist_clear(cons2); consensus_split_lines(cons1, "B\n", area);

1 0