- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug #13324: Address comments from mcs's review
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 8ad38fa9eed101c4e44ce6c7951579cf13fd708b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:49:41 2014 -0700 Bug #13324: Address comments from mcs's review --- gitian/check-match.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 43d1ef1..0622512 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -52,6 +52,7 @@ do done cd ../.. +# XXX: We should refactor this code into a shared function if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] then for u in $USERS @@ -94,6 +95,7 @@ then if [ -z "$VALID_incrementals" ] then echo "No incremental mars hashes or sigs published for $TORBROWSER_VERSION." + exit_val=1 else echo "Matching incremental mars exist from the following users: $VALID_incrementals" fi

1 0

[tor-browser-bundle/master] Bump NoScript and Tor versions.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 45180fdb5a647c13f7192e91e8d63370e860d4b9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:54:30 2014 -0700 Bump NoScript and Tor versions. --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/versions | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 92a060b..fe53b58 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,5 +1,7 @@ Tor Browser 4.0.1 -- Oct 30 2014 * All Platforms + * Update Tor to 0.2.5.10 + * Update NoScript to 2.6.9.3 * Bug 13301: Prevent extensions incompatibility error after upgrades * Bug 13460: Fix MSVC compilation issue * Windows diff --git a/gitian/versions b/gitian/versions index a24f492..5db0e5d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 -TOR_TAG=tor-0.2.5.8-rc +TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.1-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=92bfa1f8a5673ffc82fe54db43c5f410c1cf403e38b82780f01eeeeae8233d0b +NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bump Tor Browser tag.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 3511160eff94afce904590940eee59dd6dd6685a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:55:55 2014 -0700 Bump Tor Browser tag. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 5db0e5d..8d8c4c9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build2 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.1

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/update-responses-3'
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 6f6c2ab62c3d24201df55d25346d52933a72abb1 Merge: adcf052 f1472e5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:48:41 2014 -0700 Merge remote-tracking branch 'boklm/update-responses-3' gitian/Makefile | 15 ++++ gitian/check-match.sh | 44 +++++++++- gitian/hash-bundles.sh | 8 +- gitian/upload-signature.sh | 9 +- tools/update-responses/README.md | 11 ++- tools/update-responses/config.yml | 2 + tools/update-responses/update_responses | 146 +++++++++++++++++++++++++++++-- 7 files changed, 220 insertions(+), 15 deletions(-)

1 0

[tor-browser-bundle/master] update_responses: write things in sorted order
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 3cfcdc6a9b8261186063932277fffe112ff98ff1 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Sat Sep 27 14:37:11 2014 +0200 update_responses: write things in sorted order So that the same input files always produce the same output files. --- tools/update-responses/update_responses | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e082592..6e9365a 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -106,7 +106,8 @@ sub get_response { defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), ); foreach my $patch (@patches) { - $writer->startTag('patch', %$patch); + my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; + $writer->startTag('patch', @sorted_patch); $writer->endTag('patch'); } CLOSETAGS: @@ -141,16 +142,16 @@ sub write_htaccess { my ($config) = @_; my $htaccess = "RewriteEngine On\n"; my $flags = "[last]"; - foreach my $channel (keys %{$config->{channels}}) { + foreach my $channel (sort keys %{$config->{channels}}) { my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule " . "^$channel/[^\/]+/$version/ " . "no-update.xml $flags\n"; - foreach my $os (keys %$files) { + foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); - foreach my $lang (keys %{$files->{$os}}) { - foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; }

1 0

[tor-browser-bundle/master] update_responses: generate multiple MAR files in parallel
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 49c5f2e28f172e85c66f0ba3cd63645a7373858e Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Oct 2 18:35:08 2014 +0200 update_responses: generate multiple MAR files in parallel Generating incremental MAR files takes a lot of time but only uses one thread. To make that faster, we will be creating multiple MAR files in parallel. The number of files we generate in parallel will be equal to the number of CPU cores, unless the NUM_PROCS environment variable is set. --- tools/update-responses/README.md | 8 +++--- tools/update-responses/update_responses | 43 +++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index c7ecdd4..206bd7a 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,21 +13,23 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which + IO::CaptureOutput File::Which Parallel::ForkManager On Debian / Ubuntu you can install them with: ``` # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ - libio-captureoutput-perl libfile-which-perl + libio-captureoutput-perl libfile-which-perl \ + libparallel-forkmanager-perl ``` On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ - File::Temp IO::CaptureOutput File::Which + File::Temp IO::CaptureOutput File::Which \ + Parallel::ForkManager do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1946278..3590227 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -11,6 +11,7 @@ use File::Temp; use File::Find; use File::Which; use IO::CaptureOutput qw(capture_exec); +use Parallel::ForkManager; my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); @@ -27,6 +28,14 @@ sub build_target_by_os { $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; } +sub get_nbprocs { + return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; + if (-f '/proc/cpuinfo') { + return scalar grep { m/^processor\s+:\s/ } read_file '/proc/cpuinfo'; + } + return 4; +} + sub write_htdocs { my ($file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; @@ -105,31 +114,38 @@ sub mar_filename { } sub create_incremental_mar { - my ($config, $from_version, $new_version, $os, $lang) = @_; - print "Creating incremental mar file ", - "$from_version -> $new_version ($os $lang)\n"; + my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; + my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.mar"; + print "Starting $mar_file\n"; + my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $finished_file = sub { + exit_error "Error creating $mar_file" unless $_[1] == 0; + print "Finished $mar_file\n"; + $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { + type => 'partial', + URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + size => -s $mar_file_path, + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file($mar_file_path), + }; + }; + return if $pm->start($finished_file); my $tmpdir = File::Temp->newdir(); extract_mar(mar_filename($from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($new_version, $os, $lang), "$tmpdir/B"); - my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.mar"; - my $mar_file_path = "$releases_dir/$new_version/$mar_file"; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) { unlink $mar_file_path if -f $mar_file_path; exit_error "making incremental mar:\n" . $err; } - $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { - type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", - size => -s $mar_file_path, - hashFunction => 'SHA512', - hashValue => get_sha512_hex_of_file($mar_file_path), - }; + $pm->finish; } sub create_missing_incremental_mars { my ($config, $version) = @_; + my $pm = Parallel::ForkManager->new(get_nbprocs); + $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { $config->{versions}{$from_version} //= { download_url => '' }; @@ -139,10 +155,11 @@ sub create_missing_incremental_mars { foreach my $lang (keys %{$v->{files}{$os}}) { next if defined $v->{files}{$os}{$lang}{partial}{$from_version}; next unless defined $from_v->{files}{$os}{$lang}{complete}; - create_incremental_mar($config, $from_version, $version, $os, $lang); + create_incremental_mar($config, $pm, $from_version, $version, $os, $lang); } } } + $pm->wait_all_children; } sub get_config {

1 0

[tor-browser-bundle/master] update_responses: use MAR files in gitian/$version
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 3a87320ea29455b58ee4978f58f3c24f7113b8e6 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Sat Sep 27 15:23:42 2014 +0200 update_responses: use MAR files in gitian/$version Look for MAR files where the gitian build put them instead of a releases subdir. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/releases/.directory b/tools/update-responses/releases/.directory deleted file mode 100644 index e69de29..0000000 diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 6e9365a..e94c15f 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -45,7 +45,7 @@ sub get_version_files { my ($config, $version) = @_; return if $config->{versions}{$version}{files}; my $files = {}; - my $vdir = "$FindBin::Bin/releases/$version"; + my $vdir = "$FindBin::Bin/../../gitian/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file";

1 0

[tor-browser-bundle/master] update_responses: generate incremental MAR files
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 389f843dd3bb19f703a4448528e3d5b92942bf04 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Oct 2 15:34:06 2014 +0200 update_responses: generate incremental MAR files Generate incremental MAR file when they are not already there. The list of versions from which to generate incremental MAR is defined in config.yml as incremental_from for each version. The script expects the MAR tools (the mar and make_incremental_update.sh commands) to be available in the PATH. --- tools/update-responses/README.md | 9 ++-- tools/update-responses/config.yml | 2 + tools/update-responses/update_responses | 80 ++++++++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index ee21bac..c7ecdd4 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -12,19 +12,22 @@ Dependencies ------------ The following perl modules need to be installed to run the script: - FindBin YAML File::Slurp Digest::SHA XML::Writer + FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp + IO::CaptureOutput File::Which On Debian / Ubuntu you can install them with: ``` # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ - libdigest-sha-perl libxml-writer-perl + libdigest-sha-perl libxml-writer-perl \ + libio-captureoutput-perl libfile-which-perl ``` On Red Hat / Fedora you can install them with: ``` - # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer + # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ + File::Temp IO::CaptureOutput File::Which do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index b49ce1a..ad1c512 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -16,6 +16,8 @@ versions: platformVersion: 24.8.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/4.0-alpha-3 + incremental_from: + - 4.0-alpha-2 # osx32: # minSupportedOSVersion: 10.7 # unsupported: 1 diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e86979b..1946278 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -6,13 +6,20 @@ use YAML qw(LoadFile); use File::Slurp; use Digest::SHA; use XML::Writer; +use Cwd; +use File::Temp; +use File::Find; +use File::Which; +use IO::CaptureOutput qw(capture_exec); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { print STDERR "Error: ", $_[0], "\n"; + chdir '/'; exit (exists $_[1] ? $_[1] : 1); } @@ -45,7 +52,7 @@ sub get_version_files { my ($config, $version) = @_; return if $config->{versions}{$version}{files}; my $files = {}; - my $vdir = "$FindBin::Bin/../../gitian/$version"; + my $vdir = "$releases_dir/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -75,6 +82,69 @@ sub get_version_files { $config->{versions}{$version}{files} = $files; } +sub extract_mar { + my ($mar_file, $dest_dir) = @_; + my $old_cwd = getcwd; + mkdir $dest_dir; + chdir $dest_dir or exit_error "Cannot enter $dest_dir"; + my $res = system('mar', '-x', $mar_file); + exit_error "Error extracting $mar_file" if $res; + my $bunzip_file = sub { + return unless -f $File::Find::name; + rename $File::Find::name, "$File::Find::name.bz2"; + system('bunzip2', "$File::Find::name.bz2") == 0 + || exit_error "Error decompressing $File::Find::name"; + }; + find($bunzip_file, $dest_dir); + chdir $old_cwd; +} + +sub mar_filename { + my ($version, $os, $lang) = @_; + "$releases_dir/$version/tor-browser-$os-${version}_$lang.mar"; +} + +sub create_incremental_mar { + my ($config, $from_version, $new_version, $os, $lang) = @_; + print "Creating incremental mar file ", + "$from_version -> $new_version ($os $lang)\n"; + my $tmpdir = File::Temp->newdir(); + extract_mar(mar_filename($from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($new_version, $os, $lang), "$tmpdir/B"); + my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.mar"; + my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my ($out, $err, $success) = capture_exec('make_incremental_update.sh', + $mar_file_path, "$tmpdir/A", "$tmpdir/B"); + if (!$success) { + unlink $mar_file_path if -f $mar_file_path; + exit_error "making incremental mar:\n" . $err; + } + $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { + type => 'partial', + URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + size => -s $mar_file_path, + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file($mar_file_path), + }; +} + +sub create_missing_incremental_mars { + my ($config, $version) = @_; + my $v = $config->{versions}{$version}; + foreach my $from_version (@{$v->{incremental_from}}) { + $config->{versions}{$from_version} //= { download_url => '' }; + get_version_files($config, $from_version); + my $from_v = $config->{versions}{$from_version}; + foreach my $os (keys %{$v->{files}}) { + foreach my $lang (keys %{$v->{files}{$os}}) { + next if defined $v->{files}{$os}{$lang}{partial}{$from_version}; + next unless defined $from_v->{files}{$os}{$lang}{complete}; + create_incremental_mar($config, $from_version, $version, $os, $lang); + } + } + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -121,6 +191,7 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); + create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { @@ -165,6 +236,13 @@ sub write_htaccess { write_htdocs('.htaccess', $htaccess); } +sub check_deps { + foreach my $bin (qw(bunzip2 mar mbsdiff make_incremental_update.sh)) { + exit_error "Cannot find $bin in PATH" unless which($bin); + } +} + +check_deps; write_responses($config); write_htaccess($config); clean_htdocs;

1 0

[tor-browser-bundle/master] update_responses: accept '-' in version numbers
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 9e26ef8acfaefd7d7a84338e1bdb75efc0087de8 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Oct 2 14:13:55 2014 +0200 update_responses: accept '-' in version numbers Version numbers like '4.0-alpha-2' contain '-'. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e94c15f..e86979b 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -60,7 +60,7 @@ sub get_version_files { }; next; } - if ($file =~ m/^tor-browser-([^-]+)-([^-]+)-${version}_(.+)\.mar$/) { + if ($file =~ m/^tor-browser-([^-]+)-(.+)-${version}_(.+)\.mar$/) { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial',

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 187dd1ff67068abde5d36f61aca1305c76daded8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:18:40 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 13416: Defend against new SSLv3 attack (poodle). --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e0eb834..83b79b2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -169,6 +169,8 @@ pref("media.audio_data.enabled", false); // Enable TLS 1.1 and 1.2: // https://trac.torproject.org/projects/tor/ticket/11253 pref("security.tls.version.max", 3); +// POODLE hotfix: Disable SSLv3 +pref("security.tls.version.min", 1); #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__);

1 0