Upgrade chrome's OpenSSL to same version Android ships with.

This change is basically from openssl.org with the patches applied as per patches/README in https://android.googlesource.com/platform/external/openssl, plus 3 patches for Chromium to pass compliation and tests. Please refer to b/5428019 for more details.

BUG=None
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9254031

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

1 files changed, 78 insertions, 25 deletions

diff --git a/openssl.gyp b/openssl.gyp
index 273d399..c647c71 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -28,7 +28,6 @@
         'openssl/ssl/d1_meth.c',
         'openssl/ssl/d1_pkt.c',
         'openssl/ssl/d1_srvr.c',
-        'openssl/ssl/fnv1a64.c',
         'openssl/ssl/kssl.c',
         'openssl/ssl/s23_clnt.c',
         'openssl/ssl/s23_lib.c',
@@ -83,11 +82,9 @@
         'openssl/crypto/asn1/a_dup.c',
         'openssl/crypto/asn1/a_enum.c',
         'openssl/crypto/asn1/a_gentm.c',
-        'openssl/crypto/asn1/a_hdr.c',
         'openssl/crypto/asn1/a_i2d_fp.c',
         'openssl/crypto/asn1/a_int.c',
         'openssl/crypto/asn1/a_mbstr.c',
-        'openssl/crypto/asn1/a_meth.c',
         'openssl/crypto/asn1/a_object.c',
         'openssl/crypto/asn1/a_octet.c',
         'openssl/crypto/asn1/a_print.c',
@@ -100,6 +97,7 @@
         'openssl/crypto/asn1/a_utctm.c',
         'openssl/crypto/asn1/a_utf8.c',
         'openssl/crypto/asn1/a_verify.c',
+        'openssl/crypto/asn1/ameth_lib.c',
         'openssl/crypto/asn1/asn1_err.c',
         'openssl/crypto/asn1/asn1_gen.c',
         'openssl/crypto/asn1/asn1_lib.c',
@@ -107,6 +105,8 @@
         'openssl/crypto/asn1/asn_mime.c',
         'openssl/crypto/asn1/asn_moid.c',
         'openssl/crypto/asn1/asn_pack.c',
+        'openssl/crypto/asn1/bio_asn1.c',
+        'openssl/crypto/asn1/bio_ndef.c',
         'openssl/crypto/asn1/d2i_pr.c',
         'openssl/crypto/asn1/d2i_pu.c',
         'openssl/crypto/asn1/evp_asn1.c',
@@ -131,6 +131,7 @@
         'openssl/crypto/asn1/tasn_enc.c',
         'openssl/crypto/asn1/tasn_fre.c',
         'openssl/crypto/asn1/tasn_new.c',
+        'openssl/crypto/asn1/tasn_prn.c',
         'openssl/crypto/asn1/tasn_typ.c',
         'openssl/crypto/asn1/tasn_utl.c',
         'openssl/crypto/asn1/x_algor.c',
@@ -141,6 +142,7 @@
         'openssl/crypto/asn1/x_info.c',
         'openssl/crypto/asn1/x_long.c',
         'openssl/crypto/asn1/x_name.c',
+        'openssl/crypto/asn1/x_nx509.c',
         'openssl/crypto/asn1/x_pkey.c',
         'openssl/crypto/asn1/x_pubkey.c',
         'openssl/crypto/asn1/x_req.c',
@@ -193,7 +195,6 @@
         'openssl/crypto/bn/bn_mpi.c',
         'openssl/crypto/bn/bn_mul.c',
         'openssl/crypto/bn/bn_nist.c',
-        'openssl/crypto/bn/bn_opt.c',
         'openssl/crypto/bn/bn_prime.c',
         'openssl/crypto/bn/bn_print.c',
         'openssl/crypto/bn/bn_rand.c',
@@ -202,15 +203,32 @@
         'openssl/crypto/bn/bn_sqr.c',
         'openssl/crypto/bn/bn_sqrt.c',
         'openssl/crypto/bn/bn_word.c',
-        'openssl/crypto/bn/bn_x931p.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/comp/c_rle.c',
         'openssl/crypto/comp/c_zlib.c',
         'openssl/crypto/comp/comp_err.c',
@@ -231,7 +249,6 @@
         'openssl/crypto/des/cfb64enc.c',
         'openssl/crypto/des/cfb_enc.c',
         'openssl/crypto/des/des_enc.c',
-        'openssl/crypto/des/des_lib.c',
         'openssl/crypto/des/des_old.c',
         'openssl/crypto/des/des_old2.c',
         'openssl/crypto/des/ecb3_enc.c',
@@ -252,6 +269,7 @@
         'openssl/crypto/des/set_key.c',
         'openssl/crypto/des/str2key.c',
         'openssl/crypto/des/xcbc_enc.c',
+        'openssl/crypto/dh/dh_ameth.c',
         'openssl/crypto/dh/dh_asn1.c',
         'openssl/crypto/dh/dh_check.c',
         'openssl/crypto/dh/dh_depr.c',
@@ -259,6 +277,9 @@
         'openssl/crypto/dh/dh_gen.c',
         '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',
         'openssl/crypto/dsa/dsa_err.c',
@@ -266,18 +287,20 @@
         'openssl/crypto/dsa/dsa_key.c',
         'openssl/crypto/dsa/dsa_lib.c',
         'openssl/crypto/dsa/dsa_ossl.c',
+        'openssl/crypto/dsa/dsa_pmeth.c',
+        'openssl/crypto/dsa/dsa_prn.c',
         'openssl/crypto/dsa/dsa_sign.c',
-        'openssl/crypto/dsa/dsa_utl.c',
         'openssl/crypto/dsa/dsa_vrf.c',
+        'openssl/crypto/dso/dso_beos.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/dyn_lck.c',
         'openssl/crypto/ebcdic.c',
         'openssl/crypto/ec/ec2_mult.c',
         'openssl/crypto/ec/ec2_smpl.c',
         'openssl/crypto/ec/ec_asn1.c',
+        'openssl/crypto/ec/ec_ameth.c',
         'openssl/crypto/ec/ec_check.c',
         'openssl/crypto/ec/ec_curve.c',
         'openssl/crypto/ec/ec_cvt.c',
@@ -285,7 +308,9 @@
         'openssl/crypto/ec/ec_key.c',
         'openssl/crypto/ec/ec_lib.c',
         'openssl/crypto/ec/ec_mult.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_smpl.c',
@@ -310,24 +335,22 @@
         'openssl/crypto/engine/eng_lib.c',
         'openssl/crypto/engine/eng_list.c',
         'openssl/crypto/engine/eng_openssl.c',
-        'openssl/crypto/engine/eng_padlock.c',
         'openssl/crypto/engine/eng_pkey.c',
         'openssl/crypto/engine/eng_table.c',
+        'openssl/crypto/engine/tb_asnmth.c',
         'openssl/crypto/engine/tb_cipher.c',
         'openssl/crypto/engine/tb_dh.c',
         'openssl/crypto/engine/tb_digest.c',
         'openssl/crypto/engine/tb_dsa.c',
         'openssl/crypto/engine/tb_ecdh.c',
         'openssl/crypto/engine/tb_ecdsa.c',
+        'openssl/crypto/engine/tb_pkmeth.c',
         'openssl/crypto/engine/tb_rand.c',
         'openssl/crypto/engine/tb_rsa.c',
         'openssl/crypto/engine/tb_store.c',
         'openssl/crypto/err/err.c',
         'openssl/crypto/err/err_all.c',
-        'openssl/crypto/err/err_bio.c',
-        'openssl/crypto/err/err_def.c',
         'openssl/crypto/err/err_prn.c',
-        'openssl/crypto/err/err_str.c',
         'openssl/crypto/evp/bio_b64.c',
         'openssl/crypto/evp/bio_enc.c',
         'openssl/crypto/evp/bio_md.c',
@@ -335,7 +358,6 @@
         'openssl/crypto/evp/c_all.c',
         'openssl/crypto/evp/c_allc.c',
         'openssl/crypto/evp/c_alld.c',
-        'openssl/crypto/evp/dig_eng.c',
         'openssl/crypto/evp/digest.c',
         'openssl/crypto/evp/e_aes.c',
         'openssl/crypto/evp/e_bf.c',
@@ -350,10 +372,8 @@
         'openssl/crypto/evp/e_rc5.c',
         'openssl/crypto/evp/e_seed.c',
         'openssl/crypto/evp/e_xcbc_d.c',
-        'openssl/crypto/evp/enc_min.c',
         'openssl/crypto/evp/encode.c',
         'openssl/crypto/evp/evp_acnf.c',
-        'openssl/crypto/evp/evp_cnf.c',
         'openssl/crypto/evp/evp_enc.c',
         'openssl/crypto/evp/evp_err.c',
         'openssl/crypto/evp/evp_key.c',
@@ -371,6 +391,8 @@
         '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',
         'openssl/crypto/evp/names.c',
         'openssl/crypto/evp/p5_crpt.c',
         'openssl/crypto/evp/p5_crpt2.c',
@@ -381,8 +403,12 @@
         'openssl/crypto/evp/p_seal.c',
         'openssl/crypto/evp/p_sign.c',
         'openssl/crypto/evp/p_verify.c',
+        'openssl/crypto/evp/pmeth_fn.c',
+        'openssl/crypto/evp/pmeth_gn.c',
+        'openssl/crypto/evp/pmeth_lib.c',
         'openssl/crypto/ex_data.c',
-        'openssl/crypto/fips_err.c',
+        'openssl/crypto/hmac/hm_ameth.c',
+        'openssl/crypto/hmac/hm_pmeth.c',
         'openssl/crypto/hmac/hmac.c',
         'openssl/crypto/krb5/krb5_asn.c',
         'openssl/crypto/lhash/lh_stats.c',
@@ -393,17 +419,24 @@
         '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/cfb128.c',
+        'openssl/crypto/modes/ctr128.c',
+        'openssl/crypto/modes/cts128.c',
+        'openssl/crypto/modes/ofb128.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',
         'openssl/crypto/objects/obj_dat.c',
         'openssl/crypto/objects/obj_err.c',
         'openssl/crypto/objects/obj_lib.c',
+        'openssl/crypto/objects/obj_xref.c',
         'openssl/crypto/ocsp/ocsp_asn.c',
         'openssl/crypto/ocsp/ocsp_cl.c',
         'openssl/crypto/ocsp/ocsp_err.c',
@@ -424,6 +457,7 @@
         'openssl/crypto/pem/pem_sign.c',
         'openssl/crypto/pem/pem_x509.c',
         'openssl/crypto/pem/pem_xaux.c',
+        'openssl/crypto/pem/pvkfmt.c',
         'openssl/crypto/pkcs12/p12_add.c',
         'openssl/crypto/pkcs12/p12_asn.c',
         'openssl/crypto/pkcs12/p12_attr.c',
@@ -439,6 +473,7 @@
         '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',
@@ -449,7 +484,6 @@
         'openssl/crypto/pqueue/pqueue.c',
         'openssl/crypto/rand/md_rand.c',
         'openssl/crypto/rand/rand_egd.c',
-        'openssl/crypto/rand/rand_eng.c',
         'openssl/crypto/rand/rand_err.c',
         'openssl/crypto/rand/rand_lib.c',
         'openssl/crypto/rand/rand_nw.c',
@@ -463,15 +497,14 @@
         'openssl/crypto/rc2/rc2cfb64.c',
         'openssl/crypto/rc2/rc2ofb64.c',
         'openssl/crypto/rc4/rc4_enc.c',
-        'openssl/crypto/rc4/rc4_fblk.c',
         'openssl/crypto/rc4/rc4_skey.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_eay.c',
-        'openssl/crypto/rsa/rsa_eng.c',
         'openssl/crypto/rsa/rsa_err.c',
         'openssl/crypto/rsa/rsa_gen.c',
         'openssl/crypto/rsa/rsa_lib.c',
@@ -479,12 +512,13 @@
         'openssl/crypto/rsa/rsa_null.c',
         'openssl/crypto/rsa/rsa_oaep.c',
         'openssl/crypto/rsa/rsa_pk1.c',
+        'openssl/crypto/rsa/rsa_pmeth.c',
+        'openssl/crypto/rsa/rsa_prn.c',
         'openssl/crypto/rsa/rsa_pss.c',
         'openssl/crypto/rsa/rsa_saos.c',
         'openssl/crypto/rsa/rsa_sign.c',
         'openssl/crypto/rsa/rsa_ssl.c',
         'openssl/crypto/rsa/rsa_x931.c',
-        'openssl/crypto/rsa/rsa_x931g.c',
         'openssl/crypto/sha/sha1_one.c',
         'openssl/crypto/sha/sha1dgst.c',
         'openssl/crypto/sha/sha256.c',
@@ -496,7 +530,17 @@
         'openssl/crypto/store/str_lib.c',
         'openssl/crypto/store/str_mem.c',
         'openssl/crypto/store/str_meth.c',
-        'openssl/crypto/tmdiff.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',
@@ -504,6 +548,8 @@
         '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',
@@ -601,8 +647,14 @@
           'sources/': [
             ['exclude', 'cast/.*$'],
             ['exclude', 'crypto/md2/.*$'],
-            ['exclude', 'crypto/evp/e_camellia\.c'],
-            ['exclude', 'crypto/evp/m_mdc2\.c'],
+            ['exclude', 'crypto/store/.*$'],
+            ['exclude', 'crypto/whrlpool/.$'],
+          ],
+        }, {
+          'sources/': [
+            ['exclude', 'camellia/.*$'],
+            ['exclude', 'cms/.*$'],
+            ['exclude', 'mdc2/.*$'],
           ],
         }],
       ],
@@ -612,6 +664,7 @@
         'openssl/crypto',
         'openssl/crypto/asn1',
         'openssl/crypto/evp',
+        'openssl/crypto/store',
         'openssl/include',
         '<@(openssl_config_path)',
       ],