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

1 files changed, 80 insertions, 92 deletions

diff --git a/openssl.gyp b/openssl.gyp
index c9bf79f..8ef6a51 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -19,12 +19,10 @@
       '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_srvr.c',
+        'openssl/ssl/d1_srtp.c',
         'openssl/ssl/kssl.c',
         'openssl/ssl/s23_clnt.c',
         'openssl/ssl/s23_lib.c',
@@ -61,13 +59,13 @@
         'openssl/ssl/t1_meth.c',
         'openssl/ssl/t1_reneg.c',
         'openssl/ssl/t1_srvr.c',
+        'openssl/ssl/tls_srp.c',
 
         'openssl/crypto/aes/aes_cbc.c',
         'openssl/crypto/aes/aes_cfb.c',
         'openssl/crypto/aes/aes_core.c',
         'openssl/crypto/aes/aes_ctr.c',
         'openssl/crypto/aes/aes_ecb.c',
-        'openssl/crypto/aes/aes_ige.c',
         'openssl/crypto/aes/aes_misc.c',
         'openssl/crypto/aes/aes_ofb.c',
         'openssl/crypto/aes/aes_wrap.c',
@@ -151,7 +149,6 @@
         'openssl/crypto/bf/bf_cfb64.c',
         'openssl/crypto/bf/bf_ecb.c',
         'openssl/crypto/bf/bf_enc.c',
-        'openssl/crypto/bf/bf_enc.c',
         'openssl/crypto/bf/bf_ofb64.c',
         'openssl/crypto/bf/bf_skey.c',
         'openssl/crypto/bio/b_dump.c',
@@ -178,7 +175,6 @@
         'openssl/crypto/bn/bn_blind.c',
         'openssl/crypto/bn/bn_const.c',
         'openssl/crypto/bn/bn_ctx.c',
-        'openssl/crypto/bn/bn_depr.c',
         'openssl/crypto/bn/bn_div.c',
         'openssl/crypto/bn/bn_err.c',
         'openssl/crypto/bn/bn_exp.c',
@@ -201,31 +197,11 @@
         'openssl/crypto/bn/bn_sqrt.c',
         'openssl/crypto/bn/bn_word.c',
         'openssl/crypto/buffer/buf_err.c',
+        'openssl/crypto/buffer/buf_str.c',
         'openssl/crypto/buffer/buffer.c',
-        'openssl/crypto/camellia/camellia.c',
-        'openssl/crypto/camellia/cmll_cbc.c',
-        'openssl/crypto/camellia/cmll_cfb.c',
-        'openssl/crypto/camellia/cmll_ctr.c',
-        'openssl/crypto/camellia/cmll_ecb.c',
-        'openssl/crypto/camellia/cmll_misc.c',
-        'openssl/crypto/camellia/cmll_ofb.c',
-        'openssl/crypto/cast/c_cfb64.c',
-        'openssl/crypto/cast/c_ecb.c',
-        'openssl/crypto/cast/c_enc.c',
-        'openssl/crypto/cast/c_ofb64.c',
-        'openssl/crypto/cast/c_skey.c',
-        'openssl/crypto/cms/cms_asn1.c',
-        'openssl/crypto/cms/cms_att.c',
-        'openssl/crypto/cms/cms_cd.c',
-        'openssl/crypto/cms/cms_dd.c',
-        'openssl/crypto/cms/cms_enc.c',
-        'openssl/crypto/cms/cms_env.c',
-        'openssl/crypto/cms/cms_err.c',
-        'openssl/crypto/cms/cms_ess.c',
-        'openssl/crypto/cms/cms_io.c',
-        'openssl/crypto/cms/cms_lib.c',
-        'openssl/crypto/cms/cms_sd.c',
-        'openssl/crypto/cms/cms_smime.c',
+        'openssl/crypto/cmac/cm_ameth.c',
+        'openssl/crypto/cmac/cm_pmeth.c',
+        'openssl/crypto/cmac/cmac.c',
         'openssl/crypto/comp/c_rle.c',
         'openssl/crypto/comp/c_zlib.c',
         'openssl/crypto/comp/comp_err.c',
@@ -275,7 +251,6 @@
         'openssl/crypto/dh/dh_key.c',
         'openssl/crypto/dh/dh_lib.c',
         'openssl/crypto/dh/dh_pmeth.c',
-        'openssl/crypto/dh/dh_prn.c',
         'openssl/crypto/dsa/dsa_ameth.c',
         'openssl/crypto/dsa/dsa_asn1.c',
         'openssl/crypto/dsa/dsa_depr.c',
@@ -288,16 +263,18 @@
         'openssl/crypto/dsa/dsa_prn.c',
         'openssl/crypto/dsa/dsa_sign.c',
         'openssl/crypto/dsa/dsa_vrf.c',
-        'openssl/crypto/dso/dso_beos.c',
+        'openssl/crypto/dso/dso_dl.c',
+        'openssl/crypto/dso/dso_dlfcn.c',
         'openssl/crypto/dso/dso_err.c',
         'openssl/crypto/dso/dso_lib.c',
         'openssl/crypto/dso/dso_null.c',
         'openssl/crypto/dso/dso_openssl.c',
         'openssl/crypto/ebcdic.c',
         'openssl/crypto/ec/ec2_mult.c',
+        'openssl/crypto/ec/ec2_oct.c',
         'openssl/crypto/ec/ec2_smpl.c',
-        'openssl/crypto/ec/ec_asn1.c',
         'openssl/crypto/ec/ec_ameth.c',
+        'openssl/crypto/ec/ec_asn1.c',
         'openssl/crypto/ec/ec_check.c',
         'openssl/crypto/ec/ec_curve.c',
         'openssl/crypto/ec/ec_cvt.c',
@@ -305,11 +282,13 @@
         'openssl/crypto/ec/ec_key.c',
         'openssl/crypto/ec/ec_lib.c',
         'openssl/crypto/ec/ec_mult.c',
+        'openssl/crypto/ec/ec_oct.c',
         'openssl/crypto/ec/ec_pmeth.c',
         'openssl/crypto/ec/ec_print.c',
         'openssl/crypto/ec/eck_prn.c',
         'openssl/crypto/ec/ecp_mont.c',
         'openssl/crypto/ec/ecp_nist.c',
+        'openssl/crypto/ec/ecp_oct.c',
         'openssl/crypto/ec/ecp_smpl.c',
         'openssl/crypto/ecdh/ech_err.c',
         'openssl/crypto/ecdh/ech_key.c',
@@ -323,7 +302,6 @@
         'openssl/crypto/ecdsa/ecs_vrf.c',
         'openssl/crypto/engine/eng_all.c',
         'openssl/crypto/engine/eng_cnf.c',
-        'openssl/crypto/engine/eng_cryptodev.c',
         'openssl/crypto/engine/eng_ctrl.c',
         'openssl/crypto/engine/eng_dyn.c',
         'openssl/crypto/engine/eng_err.c',
@@ -331,7 +309,6 @@
         'openssl/crypto/engine/eng_init.c',
         'openssl/crypto/engine/eng_lib.c',
         'openssl/crypto/engine/eng_list.c',
-        'openssl/crypto/engine/eng_openssl.c',
         'openssl/crypto/engine/eng_pkey.c',
         'openssl/crypto/engine/eng_table.c',
         'openssl/crypto/engine/tb_asnmth.c',
@@ -357,17 +334,16 @@
         'openssl/crypto/evp/c_alld.c',
         'openssl/crypto/evp/digest.c',
         'openssl/crypto/evp/e_aes.c',
+        'openssl/crypto/evp/e_aes_cbc_hmac_sha1.c',
         'openssl/crypto/evp/e_bf.c',
-        'openssl/crypto/evp/e_camellia.c',
-        'openssl/crypto/evp/e_cast.c',
         'openssl/crypto/evp/e_des.c',
         'openssl/crypto/evp/e_des3.c',
         'openssl/crypto/evp/e_null.c',
         'openssl/crypto/evp/e_old.c',
         'openssl/crypto/evp/e_rc2.c',
         'openssl/crypto/evp/e_rc4.c',
+        'openssl/crypto/evp/e_rc4_hmac_md5.c',
         'openssl/crypto/evp/e_rc5.c',
-        'openssl/crypto/evp/e_seed.c',
         'openssl/crypto/evp/e_xcbc_d.c',
         'openssl/crypto/evp/encode.c',
         'openssl/crypto/evp/evp_acnf.c',
@@ -380,13 +356,11 @@
         'openssl/crypto/evp/m_dss.c',
         'openssl/crypto/evp/m_dss1.c',
         'openssl/crypto/evp/m_ecdsa.c',
-        'openssl/crypto/evp/m_md2.c',
         'openssl/crypto/evp/m_md4.c',
         'openssl/crypto/evp/m_md5.c',
         'openssl/crypto/evp/m_mdc2.c',
         'openssl/crypto/evp/m_null.c',
         'openssl/crypto/evp/m_ripemd.c',
-        'openssl/crypto/evp/m_sha.c',
         'openssl/crypto/evp/m_sha1.c',
         'openssl/crypto/evp/m_sigver.c',
         'openssl/crypto/evp/m_wp.c',
@@ -410,23 +384,22 @@
         'openssl/crypto/krb5/krb5_asn.c',
         'openssl/crypto/lhash/lh_stats.c',
         'openssl/crypto/lhash/lhash.c',
-        'openssl/crypto/md2/md2_dgst.c',
-        'openssl/crypto/md2/md2_one.c',
         'openssl/crypto/md4/md4_dgst.c',
         'openssl/crypto/md4/md4_one.c',
         'openssl/crypto/md5/md5_dgst.c',
         'openssl/crypto/md5/md5_one.c',
-        'openssl/crypto/mdc2/mdc2dgst.c',
-        'openssl/crypto/mdc2/mdc2_one.c',
         'openssl/crypto/mem.c',
         'openssl/crypto/mem_clr.c',
         'openssl/crypto/mem_dbg.c',
         'openssl/crypto/modes/cbc128.c',
+        'openssl/crypto/modes/ccm128.c',
         'openssl/crypto/modes/cfb128.c',
         'openssl/crypto/modes/ctr128.c',
-        'openssl/crypto/modes/cts128.c',
+        'openssl/crypto/modes/gcm128.c',
         'openssl/crypto/modes/ofb128.c',
+        'openssl/crypto/modes/xts128.c',
         'openssl/crypto/o_dir.c',
+        'openssl/crypto/o_init.c',
         'openssl/crypto/o_str.c',
         'openssl/crypto/o_time.c',
         'openssl/crypto/objects/o_names.c',
@@ -470,7 +443,6 @@
         'openssl/crypto/pkcs12/p12_p8e.c',
         'openssl/crypto/pkcs12/p12_utl.c',
         'openssl/crypto/pkcs12/pk12err.c',
-        'openssl/crypto/pkcs7/bio_pk7.c',
         'openssl/crypto/pkcs7/pk7_asn1.c',
         'openssl/crypto/pkcs7/pk7_attr.c',
         'openssl/crypto/pkcs7/pk7_doit.c',
@@ -483,10 +455,7 @@
         'openssl/crypto/rand/rand_egd.c',
         'openssl/crypto/rand/rand_err.c',
         'openssl/crypto/rand/rand_lib.c',
-        'openssl/crypto/rand/rand_nw.c',
-        'openssl/crypto/rand/rand_os2.c',
         'openssl/crypto/rand/rand_unix.c',
-        'openssl/crypto/rand/rand_win.c',
         'openssl/crypto/rand/randfile.c',
         'openssl/crypto/rc2/rc2_cbc.c',
         'openssl/crypto/rc2/rc2_ecb.c',
@@ -495,12 +464,13 @@
         'openssl/crypto/rc2/rc2ofb64.c',
         'openssl/crypto/rc4/rc4_enc.c',
         'openssl/crypto/rc4/rc4_skey.c',
+        'openssl/crypto/rc4/rc4_utl.c',
         'openssl/crypto/ripemd/rmd_dgst.c',
         'openssl/crypto/ripemd/rmd_one.c',
         'openssl/crypto/rsa/rsa_ameth.c',
         'openssl/crypto/rsa/rsa_asn1.c',
         'openssl/crypto/rsa/rsa_chk.c',
-        'openssl/crypto/rsa/rsa_depr.c',
+        'openssl/crypto/rsa/rsa_crpt.c',
         'openssl/crypto/rsa/rsa_eay.c',
         'openssl/crypto/rsa/rsa_err.c',
         'openssl/crypto/rsa/rsa_gen.c',
@@ -521,23 +491,10 @@
         'openssl/crypto/sha/sha256.c',
         'openssl/crypto/sha/sha512.c',
         'openssl/crypto/sha/sha_dgst.c',
-        'openssl/crypto/sha/sha_one.c',
+        'openssl/crypto/srp/srp_lib.c',
+        'openssl/crypto/srp/srp_vfy.c',
         'openssl/crypto/stack/stack.c',
-        'openssl/crypto/store/str_err.c',
-        'openssl/crypto/store/str_lib.c',
-        'openssl/crypto/store/str_mem.c',
-        'openssl/crypto/store/str_meth.c',
-        'openssl/crypto/ts/ts_asn1.c',
-        'openssl/crypto/ts/ts_conf.c',
         'openssl/crypto/ts/ts_err.c',
-        'openssl/crypto/ts/ts_lib.c',
-        'openssl/crypto/ts/ts_req_print.c',
-        'openssl/crypto/ts/ts_req_utils.c',
-        'openssl/crypto/ts/ts_rsp_print.c',
-        'openssl/crypto/ts/ts_rsp_sign.c',
-        'openssl/crypto/ts/ts_rsp_utils.c',
-        'openssl/crypto/ts/ts_rsp_verify.c',
-        'openssl/crypto/ts/ts_verify_ctx.c',
         'openssl/crypto/txt_db/txt_db.c',
         'openssl/crypto/ui/ui_compat.c',
         'openssl/crypto/ui/ui_err.c',
@@ -545,8 +502,6 @@
         'openssl/crypto/ui/ui_openssl.c',
         'openssl/crypto/ui/ui_util.c',
         'openssl/crypto/uid.c',
-        'openssl/crypto/whrlpool/wp_block.c',
-        'openssl/crypto/whrlpool/wp_dgst.c',
         'openssl/crypto/x509/by_dir.c',
         'openssl/crypto/x509/by_file.c',
         'openssl/crypto/x509/x509_att.c',
@@ -577,11 +532,9 @@
         'openssl/crypto/x509v3/pcy_map.c',
         'openssl/crypto/x509v3/pcy_node.c',
         'openssl/crypto/x509v3/pcy_tree.c',
-        'openssl/crypto/x509v3/v3_addr.c',
         'openssl/crypto/x509v3/v3_akey.c',
         'openssl/crypto/x509v3/v3_akeya.c',
         'openssl/crypto/x509v3/v3_alt.c',
-        'openssl/crypto/x509v3/v3_asid.c',
         'openssl/crypto/x509v3/v3_bcons.c',
         'openssl/crypto/x509v3/v3_bitst.c',
         'openssl/crypto/x509v3/v3_conf.c',
@@ -607,16 +560,6 @@
         'openssl/crypto/x509v3/v3_sxnet.c',
         'openssl/crypto/x509v3/v3_utl.c',
         'openssl/crypto/x509v3/v3err.c',
-        'openssl/engines/e_4758cca.c',
-        'openssl/engines/e_aep.c',
-        'openssl/engines/e_atalla.c',
-        'openssl/engines/e_capi.c',
-        'openssl/engines/e_chil.c',
-        'openssl/engines/e_cswift.c',
-        'openssl/engines/e_gmp.c',
-        'openssl/engines/e_nuron.c',
-        'openssl/engines/e_sureware.c',
-        'openssl/engines/e_ubsec.c',
       ],
       'conditions': [
         ['os_posix==1 and OS!="android"', {
@@ -641,17 +584,62 @@
           'variables': {
             'openssl_config_path': 'config/android',
           },
-          'sources/': [
-            ['exclude', 'cast/.*$'],
-            ['exclude', 'crypto/md2/.*$'],
-            ['exclude', 'crypto/store/.*$'],
-            ['exclude', 'crypto/whrlpool/.$'],
+        }],
+        ['target_arch == "arm"', {
+          'sources!': [
+            # Use assembly version of this source file for ARM.
+            'openssl/crypto/aes/aes_core.c',
+          ],
+          'sources': [
+            'openssl/crypto/aes/asm/aes-armv4.S',
+            'openssl/crypto/bn/asm/armv4-gf2m.S',
+            'openssl/crypto/bn/asm/armv4-mont.S',
+            'openssl/crypto/modes/asm/ghash-armv4.S',
+            'openssl/crypto/sha/asm/sha1-armv4-large.S',
+            'openssl/crypto/sha/asm/sha256-armv4.S',
+            'openssl/crypto/sha/asm/sha512-armv4.S',
+          ],
+        }],
+        ['target_arch == "ia32"', {
+          'sources!': [
+            # Use assembly version of this source file for ARM.
+            'openssl/crypto/aes/aes_core.c',
+            'openssl/crypto/aes/aes_cbc.c',
+            'openssl/crypto/des/des_enc.c',
+            'openssl/crypto/des/fcrypt_b.c',
+            'openssl/crypto/bf/bf_enc.c',
+            'openssl/crypto/bn/bn_asm.c',
           ],
-        }, {
-          'sources/': [
-            ['exclude', 'camellia/.*$'],
-            ['exclude', 'cms/.*$'],
-            ['exclude', 'mdc2/.*$'],
+          'sources': [
+            'openssl/crypto/aes/asm/aes-586.S',
+            'openssl/crypto/aes/asm/aesni-x86.S',
+            'openssl/crypto/aes/asm/vpaes-x86.S',
+            'openssl/crypto/bf/asm/bf-586.S',
+            'openssl/crypto/bn/asm/bn-586.S',
+            'openssl/crypto/bn/asm/co-586.S',
+            'openssl/crypto/bn/asm/x86-gf2m.S',
+            'openssl/crypto/bn/asm/x86-mont.S',
+            'openssl/crypto/des/asm/crypt586.S',
+            'openssl/crypto/des/asm/des-586.S',
+            'openssl/crypto/md5/asm/md5-586.S',
+            'openssl/crypto/modes/asm/ghash-x86.S',
+            'openssl/crypto/sha/asm/sha1-586.S',
+            'openssl/crypto/sha/asm/sha256-586.S',
+            'openssl/crypto/sha/asm/sha512-586.S',
+          ],
+        }],
+        ['target_arch=="mips"', {
+          'sources!': [
+            # Use assembly version of these source files for MIPS.
+            'openssl/crypto/bn/bn_asm.c',
+            'openssl/crypto/aes/aes_core.c',
+          ],
+          'sources': [
+            'openssl/crypto/aes/asm/aes-mips.S',
+            'openssl/crypto/bn/asm/bn-mips.S',
+            'openssl/crypto/bn/asm/mips-mont.S',
+            'openssl/crypto/sha/sha1-mips.S',
+            'openssl/crypto/sha/sha256-mips.S',
           ],
         }],
         ['clang==1', {
@@ -674,14 +662,14 @@
         'openssl/crypto',
         'openssl/crypto/asn1',
         'openssl/crypto/evp',
-        'openssl/crypto/store',
-        'openssl/include',
+        'openssl/crypto/modes',
         '<@(openssl_config_path)',
+        'openssl/include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          'openssl/include',
           '<@(openssl_config_path)',
+          'openssl/include',
         ],
       },
     },