Small patch to fix the "linux_redux" Chromium build.

Trying to DEPS roll the previous patch, which updates the
library to 1.0.1c, doesn't work for the following reason:

- third_party/libjingle is now referencing DTLSv1_client_method
  and DTLSv1_server_method, which were missing from openssl.gyp
  (this affects both Android and linux_redux builds).

- The piii/k8 configuration files didn't disable CAST5 and
  Whirlpool like the Android one, and the corresponding source
  files are missing from openssl.gyp.

- The piii config now enables inline assembly, but the
  source repository is missing the assembly source for
  the ia32 OPENSSL_setup_cpuid() function.

- The implementation source file for SHA-0 is not listed
  in openssl.gyp to match the Android build, which does
  explicitely disable this weak hash.

This patch is used to fix these issues in the most straightforward
way. It is possible to address the issues by adding missing source
files, but I'd rather do this in the upstream Android external/openssl
tree first, to minimize the differences between them.

BUG=137071
TEST=Passed net_unittests on both linux_redux and Android builds.

Review URL: https://chromiumcodereview.appspot.com/11467016

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@171794 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

3 files changed, 21 insertions, 2 deletions

diff --git a/config/k8/openssl/opensslconf.h b/config/k8/openssl/opensslconf.h
index b42caed..1f71022 100644
--- a/config/k8/openssl/opensslconf.h
+++ b/config/k8/openssl/opensslconf.h
@@ -11,6 +11,9 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+#ifndef OPENSSL_NO_CAST
+# define OPENSSL_NO_CAST
+#endif
 #ifndef OPENSSL_NO_CAPIENG
 # define OPENSSL_NO_CAPIENG
 #endif
@@ -50,6 +53,12 @@
 #ifndef OPENSSL_NO_SEED
 # define OPENSSL_NO_SEED
 #endif
+#ifndef OPENSSL_NO_SHA0
+# define OPENSSL_NO_SHA0
+#endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+# define OPENSSL_NO_WHIRLPOOL
+#endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
diff --git a/config/piii/openssl/opensslconf.h b/config/piii/openssl/opensslconf.h
index 864b531..c4493bf 100644
--- a/config/piii/openssl/opensslconf.h
+++ b/config/piii/openssl/opensslconf.h
@@ -8,6 +8,9 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+#ifndef OPENSSL_NO_CAST
+# define OPENSSL_NO_CAST
+#endif
 #ifndef OPENSSL_NO_CAPIENG
 # define OPENSSL_NO_CAPIENG
 #endif
@@ -47,6 +50,12 @@
 #ifndef OPENSSL_NO_SEED
 # define OPENSSL_NO_SEED
 #endif
+#ifndef OPENSSL_NO_SHA0
+# define OPENSSL_NO_SHA0
+#endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+# define OPENSSL_NO_WHIRLPOOL
+#endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
@@ -114,8 +123,6 @@
 # endif
 #endif
 
-#define OPENSSL_CPUID_OBJ
-
 /* crypto/opensslconf.h.in */
 
 #ifdef OPENSSL_DOING_MAKEDEPEND
diff --git a/openssl.gyp b/openssl.gyp
index 8ef6a51..e180211 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -19,10 +19,13 @@
       'sources': [
         'openssl/ssl/bio_ssl.c',
         'openssl/ssl/d1_both.c',
+        'openssl/ssl/d1_clnt.c',
         'openssl/ssl/d1_enc.c',
         'openssl/ssl/d1_lib.c',
+        'openssl/ssl/d1_meth.c',
         'openssl/ssl/d1_pkt.c',
         'openssl/ssl/d1_srtp.c',
+        'openssl/ssl/d1_srvr.c',
         'openssl/ssl/kssl.c',
         'openssl/ssl/s23_clnt.c',
         'openssl/ssl/s23_lib.c',