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

openssl.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'openssl',
       'type': '<(library)',
       'defines': [
@@ skipping 10 matching lines @@
       ],
       '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/fnv1a64.c',
         'openssl/ssl/kssl.c',
         'openssl/ssl/s23_clnt.c',
         'openssl/ssl/s23_lib.c',
         'openssl/ssl/s23_meth.c',
         'openssl/ssl/s23_pkt.c',
         'openssl/ssl/s23_srvr.c',
         'openssl/ssl/s2_clnt.c',
         'openssl/ssl/s2_enc.c',
         'openssl/ssl/s2_lib.c',
         'openssl/ssl/s2_meth.c',
@@ skipping 34 matching lines @@
         'openssl/crypto/aes/aes_ofb.c',
         'openssl/crypto/aes/aes_wrap.c',
         'openssl/crypto/asn1/a_bitstr.c',
         'openssl/crypto/asn1/a_bool.c',
         'openssl/crypto/asn1/a_bytes.c',
         'openssl/crypto/asn1/a_d2i_fp.c',
         'openssl/crypto/asn1/a_digest.c',
         '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',
         'openssl/crypto/asn1/a_set.c',
         'openssl/crypto/asn1/a_sign.c',
         'openssl/crypto/asn1/a_strex.c',
         'openssl/crypto/asn1/a_strnid.c',
         'openssl/crypto/asn1/a_time.c',
         'openssl/crypto/asn1/a_type.c',
         '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',
         'openssl/crypto/asn1/asn1_par.c',
         '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',
         'openssl/crypto/asn1/f_enum.c',
         'openssl/crypto/asn1/f_int.c',
         'openssl/crypto/asn1/f_string.c',
         'openssl/crypto/asn1/i2d_pr.c',
         'openssl/crypto/asn1/i2d_pu.c',
         'openssl/crypto/asn1/n_pkey.c',
         'openssl/crypto/asn1/nsseq.c',
         'openssl/crypto/asn1/p5_pbe.c',
         'openssl/crypto/asn1/p5_pbev2.c',
-        'openssl/crypto/asn1/p8_pkey.c',
+        'openssl/crypto/asn1/p8_pkey.c',        

[joth, 2012/01/20 11:01:08]

nit: trailing w/s

[Johnny(Jianning) Ding, 2012/01/23 14:20:57]

Done.

         'openssl/crypto/asn1/t_bitst.c',
         'openssl/crypto/asn1/t_crl.c',
         'openssl/crypto/asn1/t_pkey.c',
         'openssl/crypto/asn1/t_req.c',
         'openssl/crypto/asn1/t_spki.c',
         'openssl/crypto/asn1/t_x509.c',
         'openssl/crypto/asn1/t_x509a.c',
         'openssl/crypto/asn1/tasn_dec.c',
         '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',
         'openssl/crypto/asn1/x_attrib.c',
         'openssl/crypto/asn1/x_bignum.c',
         'openssl/crypto/asn1/x_crl.c',
         'openssl/crypto/asn1/x_exten.c',
         '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',
         'openssl/crypto/asn1/x_sig.c',
         'openssl/crypto/asn1/x_spki.c',
         'openssl/crypto/asn1/x_val.c',
         'openssl/crypto/asn1/x_x509.c',
         'openssl/crypto/asn1/x_x509a.c',
         'openssl/crypto/bf/bf_cfb64.c',
         'openssl/crypto/bf/bf_ecb.c',
@@ skipping 32 matching lines @@
         'openssl/crypto/bn/bn_exp2.c',
         'openssl/crypto/bn/bn_gcd.c',
         'openssl/crypto/bn/bn_gf2m.c',
         'openssl/crypto/bn/bn_kron.c',
         'openssl/crypto/bn/bn_lib.c',
         'openssl/crypto/bn/bn_mod.c',
         'openssl/crypto/bn/bn_mont.c',
         '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',
         'openssl/crypto/bn/bn_recp.c',
         'openssl/crypto/bn/bn_shift.c',
         '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',
         'openssl/crypto/comp/comp_lib.c',
         'openssl/crypto/conf/conf_api.c',
         'openssl/crypto/conf/conf_def.c',
         'openssl/crypto/conf/conf_err.c',
         'openssl/crypto/conf/conf_lib.c',
         'openssl/crypto/conf/conf_mall.c',
         'openssl/crypto/conf/conf_mod.c',
         'openssl/crypto/conf/conf_sap.c',
         'openssl/crypto/cpt_err.c',
         'openssl/crypto/cryptlib.c',
         'openssl/crypto/cversion.c',
         'openssl/crypto/des/cbc_cksm.c',
         'openssl/crypto/des/cbc_enc.c',
         'openssl/crypto/des/cfb64ede.c',
         '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',
         'openssl/crypto/des/ecb_enc.c',
         'openssl/crypto/des/ede_cbcm_enc.c',
         'openssl/crypto/des/enc_read.c',
         'openssl/crypto/des/enc_writ.c',
         'openssl/crypto/des/fcrypt.c',
         'openssl/crypto/des/fcrypt_b.c',
         'openssl/crypto/des/ofb64ede.c',
         'openssl/crypto/des/ofb64enc.c',
         'openssl/crypto/des/ofb_enc.c',
         'openssl/crypto/des/pcbc_enc.c',
         'openssl/crypto/des/qud_cksm.c',
         'openssl/crypto/des/rand_key.c',
         'openssl/crypto/des/read2pwd.c',
         'openssl/crypto/des/rpc_enc.c',
         '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',
         'openssl/crypto/dh/dh_err.c',
         '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',
         'openssl/crypto/dsa/dsa_gen.c',
         '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',
         'openssl/crypto/ec/ec_err.c',
         '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',
         'openssl/crypto/ecdh/ech_err.c',
         'openssl/crypto/ecdh/ech_key.c',
         'openssl/crypto/ecdh/ech_lib.c',
         'openssl/crypto/ecdh/ech_ossl.c',
         'openssl/crypto/ecdsa/ecs_asn1.c',
         'openssl/crypto/ecdsa/ecs_err.c',
         'openssl/crypto/ecdsa/ecs_lib.c',
         'openssl/crypto/ecdsa/ecs_ossl.c',
         'openssl/crypto/ecdsa/ecs_sign.c',
         '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',
         'openssl/crypto/engine/eng_fat.c',
         '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_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',
         'openssl/crypto/evp/bio_ok.c',
         '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',
         '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_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',
         'openssl/crypto/evp/evp_lib.c',
         'openssl/crypto/evp/evp_pbe.c',
         'openssl/crypto/evp/evp_pkey.c',
         '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',
         'openssl/crypto/evp/names.c',
         'openssl/crypto/evp/p5_crpt.c',
         'openssl/crypto/evp/p5_crpt2.c',
         'openssl/crypto/evp/p_dec.c',
         'openssl/crypto/evp/p_enc.c',
         'openssl/crypto/evp/p_lib.c',
         'openssl/crypto/evp/p_open.c',
         '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',
         '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/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',
         'openssl/crypto/ocsp/ocsp_ext.c',
         'openssl/crypto/ocsp/ocsp_ht.c',
         'openssl/crypto/ocsp/ocsp_lib.c',
         'openssl/crypto/ocsp/ocsp_prn.c',
         'openssl/crypto/ocsp/ocsp_srv.c',
         'openssl/crypto/ocsp/ocsp_vfy.c',
         'openssl/crypto/pem/pem_all.c',
         'openssl/crypto/pem/pem_err.c',
         'openssl/crypto/pem/pem_info.c',
         'openssl/crypto/pem/pem_lib.c',
         'openssl/crypto/pem/pem_oth.c',
         'openssl/crypto/pem/pem_pk8.c',
         'openssl/crypto/pem/pem_pkey.c',
         'openssl/crypto/pem/pem_seal.c',
         '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',
         'openssl/crypto/pkcs12/p12_crpt.c',
         'openssl/crypto/pkcs12/p12_crt.c',
         'openssl/crypto/pkcs12/p12_decr.c',
         'openssl/crypto/pkcs12/p12_init.c',
         'openssl/crypto/pkcs12/p12_key.c',
         'openssl/crypto/pkcs12/p12_kiss.c',
         'openssl/crypto/pkcs12/p12_mutl.c',
         'openssl/crypto/pkcs12/p12_npas.c',
         'openssl/crypto/pkcs12/p12_p8d.c',
         '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',
         'openssl/crypto/pkcs7/pk7_lib.c',
         'openssl/crypto/pkcs7/pk7_mime.c',
         'openssl/crypto/pkcs7/pk7_smime.c',
         'openssl/crypto/pkcs7/pkcs7err.c',
         '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',
         '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',
         'openssl/crypto/rc2/rc2_skey.c',
         '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',
         'openssl/crypto/rsa/rsa_none.c',
         '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',
         'openssl/crypto/sha/sha512.c',
         'openssl/crypto/sha/sha_dgst.c',
         'openssl/crypto/sha/sha_one.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/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',
         'openssl/crypto/ui/ui_lib.c',
         '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',
         'openssl/crypto/x509/x509_cmp.c',
         'openssl/crypto/x509/x509_d2.c',
         'openssl/crypto/x509/x509_def.c',
         'openssl/crypto/x509/x509_err.c',
         'openssl/crypto/x509/x509_ext.c',
         'openssl/crypto/x509/x509_lu.c',
         'openssl/crypto/x509/x509_obj.c',
@@ skipping 77 matching lines @@
             ],
           },
         }],
         ['OS=="android"', {
           'variables': {
             'openssl_config_path': 'config/android',
           },
           '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/.*$'],
+          ],        
         }],
       ],
       'include_dirs': [
         '.',
         'openssl',
         'openssl/crypto',
         'openssl/crypto/asn1',
         'openssl/crypto/evp',
         'openssl/include',
         '<@(openssl_config_path)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'openssl/include',
           '<@(openssl_config_path)',
         ],
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: