[tor-commits] [tor-browser-bundle/master] Backout Bug #10383 due to build failures.

[mikeperry at torproject.org]

commit 8806a08e9f11291ef29e28b8e7ab982f3c4ba896
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Jan 15 22:51:19 2014 -0800

    Backout Bug #10383 due to build failures.
    
    Maybe next time, NSAIST.
---
 Bundle-Data/Docs/ChangeLog.txt            |    1 -
 gitian/descriptors/linux/gitian-tor.yml   |    2 +-
 gitian/descriptors/mac/gitian-tor.yml     |    2 +-
 gitian/descriptors/windows/gitian-tor.yml |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 317d55a..0c3cbd5 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,7 +2,6 @@ Tor Browser Bundle 3.5.1 -- Jan 14 2014
  * All Platforms
    * Bug 10447: Remove SocksListenAddress to allow multiple socks ports.
    * Bug 10464: Remove addons.mozilla.org from NoScript whitelist
-   * Bug 10383: Use accelerated NIST P224 and P256 curves from OpenSSL.
    * Update Torbutton to 1.6.5.4
      * Bug 9486: Clear NoScript Temporary Permissions on New Identity
      * Bug 10403: Include Arabic translations
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 70ff906..a251f65 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -58,7 +58,7 @@ script: |
   cd openssl-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
   #./Configure -shared --prefix=$INSTDIR/openssl linux-elf
-  ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128
+  ./config -shared --prefix=$INSTDIR/openssl #enable-ec_nistp_64_gcc_128
   make
   make install
   cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index e6025c3..15b867f 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -67,7 +67,7 @@ script: |
   tar xzf openssl.tar.gz
   cd openssl-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
-  ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128
+  ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl #enable-ec_nistp_64_gcc_128
   make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/"
   make install
   #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index e63d608..660d2a7 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -73,7 +73,7 @@ script: |
   tar xzf openssl.tar.gz
   cd openssl-*
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
-  ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128
+  ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl #enable-ec_nistp_64_gcc_128
   make
   make install
   cp $INSTDIR/openssl/bin/*.dll $INSTDIR/Tor/