Upstream openssl to version 1.0.1c

This patch updates the openssl sources and corresponding build files
to version 1.0.1c to match the sources currently used by the Android
platform.

As a reminder, Chromium itself *only* uses openssl on Android, and only
to implement SSL sockets (certificate verification is performed
differently using platform APIs that talk to the framework through JNI).

On the other hand, net/tools/flip_server is a host tool that links
directly to this openssl library, and needs to be built on all
Posix systems.

Please read README.chromium, which contains a detailed list of the
patch's contents (i.e. where the sources come from, what patches were
applied, etc).

Tested:
There is no way to test this patch directly in upstream Chromium at
the moment, so all changes here have been tested downstream. All
net_unittests pass after the patch is applied. I have also used the
browser to manually navigate to various https:// sites without issues,
but would appreciate any hint on ensuring this still works well.

I have *manually* checked, by inspecting the sources, that the following
previous patches are not needed anymore because they have been integrated
into the upstream openssl source distribution:

  patches/empty_OPENSSL_cpuid_setup.patch
  patches/npn.patch
  patches/openssl_no_dtls1.patch
  patches/tls_exporter.patch

The sources have been built succesfully under the following conditions:

  - Downstream reference build for ARM
  - Downstream SDK build for ARM
  - Downstream SDK build for x86
  - Downstream Clang build for ARM
  - Upstream SDK build for ARM
  - Upstream SDK build for x86

Finally, I have tested that net/tools/flip_server still builds
properly on Linux/x64 and Linux/ia32.
Review URL: https://codereview.chromium.org/10911247

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

3 files changed, 80 insertions, 8 deletions

diff --git a/config/android/openssl/opensslconf.h b/config/android/openssl/opensslconf.h
index 26ac6ba..e60e5d4 100644
--- a/config/android/openssl/opensslconf.h
+++ b/config/android/openssl/opensslconf.h
@@ -5,9 +5,18 @@
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
 
+#ifndef OPENSSL_NO_CAMELLIA
+# define OPENSSL_NO_CAMELLIA
+#endif
 #ifndef OPENSSL_NO_CAST
 # define OPENSSL_NO_CAST
 #endif
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
@@ -23,12 +32,18 @@
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
+#ifndef OPENSSL_NO_MDC2
+# define OPENSSL_NO_MDC2
+#endif
 #ifndef OPENSSL_NO_RC5
 # define OPENSSL_NO_RC5
 #endif
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
 #ifndef OPENSSL_NO_SEED
 # define OPENSSL_NO_SEED
 #endif
@@ -38,12 +53,46 @@
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
-#ifndef OPENSSL_NO_WHRLPOOL
-# define OPENSSL_NO_WHRLPOOL
+#ifndef OPENSSL_NO_WHIRLPOOL
+# define OPENSSL_NO_WHIRLPOOL
 #endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
+#if defined(__arm__)
+
+# define OPENSSL_BN_ASM_GF2m
+# define OPENSSL_BN_ASM_MONT
+# define GHASH_ASM
+# define AES_ASM
+# define SHA1_ASM
+# define SHA256_ASM
+# define SHA512_ASM
+
+#elif defined(__i386__)
+
+# define OPENSSL_BN_ASM_GF2m
+# define OPENSSL_BN_ASM_MONT
+# define OPENSSL_BN_ASM_PART_WORDS
+# define AES_ASM 
+# define GHASH_ASM
+# define SHA1_ASM
+# define SHA256_ASM
+# define SHA512_ASM
+# define MD5_ASM
+# define DES_PTR 
+# define DES_RISC1
+# define DES_UNROLL
+
+#elif defined(__mips__)
+
+# define OPENSSL_BN_ASM_MONT
+# define AES_ASM
+# define SHA1_ASM
+# define SHA256_ASM
+
+#endif
+
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
diff --git a/config/k8/openssl/opensslconf.h b/config/k8/openssl/opensslconf.h
index f47e7b6..b42caed 100644
--- a/config/k8/openssl/opensslconf.h
+++ b/config/k8/openssl/opensslconf.h
@@ -5,6 +5,9 @@
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
 
+#ifndef OPENSSL_NO_ASM
+# define OPENSSL_NO_ASM
+#endif
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
@@ -14,6 +17,9 @@
 #ifndef OPENSSL_NO_CMS
 # define OPENSSL_NO_CMS
 #endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_FIPS
 # define OPENSSL_NO_FIPS
 #endif
@@ -38,12 +44,12 @@
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
 #ifndef OPENSSL_NO_SEED
 # define OPENSSL_NO_SEED
 #endif
-#ifndef OPENSSL_NO_ASM
-# define OPENSSL_NO_ASM
-#endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
diff --git a/config/piii/openssl/opensslconf.h b/config/piii/openssl/opensslconf.h
index 9725efa..864b531 100644
--- a/config/piii/openssl/opensslconf.h
+++ b/config/piii/openssl/opensslconf.h
@@ -14,6 +14,9 @@
 #ifndef OPENSSL_NO_CMS
 # define OPENSSL_NO_CMS
 #endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_FIPS
 # define OPENSSL_NO_FIPS
 #endif
@@ -38,12 +41,12 @@
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
 #ifndef OPENSSL_NO_SEED
 # define OPENSSL_NO_SEED
 #endif
-#ifndef OPENSSL_NO_ASM
-# define OPENSSL_NO_ASM
-#endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
@@ -54,6 +57,20 @@
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
 
+/* Use x86 assembler functions - taken from Android/x86 config */
+# define OPENSSL_BN_ASM_GF2m
+# define OPENSSL_BN_ASM_MONT
+# define OPENSSL_BN_ASM_PART_WORDS
+# define AES_ASM
+# define GHASH_ASM
+# define SHA1_ASM
+# define SHA256_ASM
+# define SHA512_ASM
+# define MD5_ASM
+# define DES_PTR
+# define DES_RISC1
+# define DES_UNROLL
+
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those
    who haven't had the time to do the appropriate changes in their