[tor-commits] [tor-browser-bundle/master] The poodle hotfix.

[gk at torproject.org]

commit fd7e8eef09b813c445e31239bcb674de7a03d191
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Oct 15 08:41:38 2014 +0000

    The poodle hotfix.
    
    See: https://www.imperialviolet.org/2014/10/14/poodle.html for further
    information.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    4 ++++
 gitian/descriptors/mac/gitian-bundle.yml     |    4 ++++
 gitian/descriptors/windows/gitian-bundle.yml |    4 ++++
 3 files changed, 12 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 19233b6..3de0d49 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -146,6 +146,8 @@ script: |
   cp defaults/preferences/000-tor-browser.js ~/build/
   # Set the locale of the bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
+  # The poodle hotfix
+  echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
   popd
@@ -176,6 +178,8 @@ script: |
     cp ~/build/000-tor-browser.js defaults/preferences/
     # Set the locale of the bundle.
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
+    # The poodle hotfix
+    echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
     rm -rf defaults
     popd
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 82b6595..9e78429 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -166,6 +166,8 @@ script: |
   cp defaults/preferences/000-tor-browser.js ~/build/
   # Set the locale of the bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
+  # The poodle hotfix
+  echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
   popd
@@ -221,6 +223,8 @@ script: |
     cp ~/build/000-tor-browser.js defaults/preferences/
     # Set the locale of the bundle.
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
+    # The poodle hotfix
+    echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
     rm -rf defaults
     popd
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 76f5c67..a3c4b8a 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -126,6 +126,8 @@ script: |
   cp defaults/preferences/000-tor-browser.js ~/build/
   # Set the locale bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
+  # The poodle hotfix
+  echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
   popd
@@ -156,6 +158,8 @@ script: |
     mkdir -p defaults/preferences
     cp ~/build/000-tor-browser.js defaults/preferences/
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
+    # The poodle hotfix
+    echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
     rm -rf defaults
     popd