From 30e7fb7307011a3c8d2586d73817ec967a863647 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 10 Apr 2012 15:57:21 +0200 Subject: deps: upgrade openssl to 1.0.0f --- deps/openssl/openssl.gyp | 209 +++++++++++++++++++++++++++++------------------ 1 file changed, 131 insertions(+), 78 deletions(-) (limited to 'deps/openssl/openssl.gyp') diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 9578ac4df0..c9bf79fafb 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -9,63 +9,12 @@ 'type': '<(library)', 'defines': [ 'L_ENDIAN', - 'OPENSSLDIR="ssl"', - 'ENGINESDIR="ssl/lib/engines"', 'OPENSSL_THREADS', 'PURIFY', + 'TERMIO', '_REENTRANT', - ], - - 'cflags!': [ - '-ansi' - ], - - 'conditions': [ - ['OS=="win"', { - 'defines': [ - 'WIN32_LEAN_AND_MEAN', # needed to avoid some name clashes that break the build. - 'MK1MF_BUILD', # trick buildinf.h into believing that we're building from nmake - 'MK1MF_PLATFORM_VC_WIN32', # ditto - ], - }], - ['OS=="mac"', { - 'defines': [ - 'TERMIOS' - ], - }], - ['OS=="linux"', { - 'defines': [ - 'TERMIO', - ], - }], - ['target_arch=="ia32" or target_arch=="x64"', { - 'include_dirs': [ - 'config/piii', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'openssl/include', - 'config/piii', - ], - }, - }], - ['target_arch=="x64"', { - 'include_dirs': [ - 'config/k8', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'openssl/include', - 'config/k8', - ], - }, - }], - ], - - 'copts': [ - '-w', - '-Wno-cast-qual', - '-Wno-error', + # We do not use TLS over UDP on Chromium so far. + 'OPENSSL_NO_DTLS1', ], 'sources': [ 'openssl/ssl/bio_ssl.c', @@ -76,7 +25,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', @@ -131,11 +79,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', @@ -148,6 +94,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', @@ -155,6 +102,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', @@ -179,6 +128,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', @@ -189,6 +139,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', @@ -241,7 +192,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', @@ -250,15 +200,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', @@ -279,7 +246,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', @@ -300,6 +266,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', @@ -307,6 +274,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', @@ -314,18 +284,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', @@ -333,7 +305,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', @@ -358,24 +332,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', @@ -383,7 +355,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', @@ -398,10 +369,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', @@ -419,6 +388,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', @@ -429,8 +400,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', @@ -441,17 +416,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', @@ -472,6 +454,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', @@ -487,6 +470,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', @@ -497,7 +481,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', @@ -511,15 +494,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', @@ -527,12 +509,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', @@ -544,7 +527,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', @@ -552,6 +545,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', @@ -623,14 +618,72 @@ 'openssl/engines/e_sureware.c', 'openssl/engines/e_ubsec.c', ], + 'conditions': [ + ['os_posix==1 and OS!="android"', { + 'defines': [ + # ENGINESDIR must be defined if OPENSSLDIR is. + 'ENGINESDIR="/dev/null"', + # Set to ubuntu default path for convenience. If necessary, override + # this at runtime with the SSL_CERT_DIR environment variable. + 'OPENSSLDIR="/etc/ssl"', + ], + 'variables': { + 'conditions': [ + ['target_arch=="ia32"', { + 'openssl_config_path': 'config/piii', + }, { + 'openssl_config_path': 'config/k8', + }], + ], + }, + }], + ['OS=="android"', { + 'variables': { + 'openssl_config_path': 'config/android', + }, + 'sources/': [ + ['exclude', 'cast/.*$'], + ['exclude', 'crypto/md2/.*$'], + ['exclude', 'crypto/store/.*$'], + ['exclude', 'crypto/whrlpool/.$'], + ], + }, { + 'sources/': [ + ['exclude', 'camellia/.*$'], + ['exclude', 'cms/.*$'], + ['exclude', 'mdc2/.*$'], + ], + }], + ['clang==1', { + 'cflags': [ + # OpenSSL has a few |if ((foo == NULL))| checks. + '-Wno-parentheses-equality', + # OpenSSL uses several function-style macros and then ignores the + # returned value. + '-Wno-unused-value', + ], + }, { # Not clang. Disable all warnings. + 'cflags': [ + '-w', + ], + }] + ], 'include_dirs': [ '.', 'openssl', 'openssl/crypto', 'openssl/crypto/asn1', 'openssl/crypto/evp', + 'openssl/crypto/store', 'openssl/include', + '<@(openssl_config_path)', ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'openssl/include', + '<@(openssl_config_path)', + ], + }, }, ], } -- cgit v1.2.3