From 418e839456e31356d96c75f0e63231affa2311aa Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Tue, 31 Mar 2015 14:09:53 +0900 Subject: [PATCH] deps: update openssl.gyp/gypi for openssl-1.0.2a Update gyp sources for openssl-1.0.2a. The source list was extracted from Makefiles in `deps/openssl/openssl/{crypto/ssl/engines}`. Defines are created by referring the table in `deps/openssl/doc/openssl_define_list.pdf` that was derived from Makefile entries and outputs of `deps/openssl/openssl/Configure TABLE`. Renamed the variable of openssl_sources_arm_elf_gas to openssl_sources_arm_void_gas to be consistent with PERLASM_SCHEME. This also includes arm64 support. Fixes: https://github.com/iojs/io.js/issues/589 PR-URL: https://github.com/iojs/io.js/pull/1389 Reviewed-By: Fedor Indutny Reviewed-By: Ben Noordhuis --- deps/openssl/openssl.gyp | 5 +- deps/openssl/openssl.gypi | 153 ++++++++++++++++++++++++++++---------- 2 files changed, 119 insertions(+), 39 deletions(-) diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 01ac2c5e051401..6d8b10d6902bf0 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -30,7 +30,7 @@ 'conditions': [ ['target_arch=="arm"', { 'defines': ['<@(openssl_defines_asm)'], - 'sources': ['<@(openssl_sources_arm_elf_gas)'], + 'sources': ['<@(openssl_sources_arm_void_gas)'], }, 'target_arch=="ia32" and OS=="mac"', { 'defines': [ '<@(openssl_defines_asm)', @@ -69,6 +69,9 @@ '<@(openssl_defines_x64_elf)', ], 'sources': ['<@(openssl_sources_x64_elf_gas)'], + }, 'target_arch=="arm64"', { + 'defines': ['<@(openssl_defines_arm64)',], + 'sources': ['<@(openssl_sources_arm64_linux64_gas)'], }, { # Other architectures don't use assembly. 'defines': ['OPENSSL_NO_ASM'], diff --git a/deps/openssl/openssl.gypi b/deps/openssl/openssl.gypi index faad91331a4f90..4082e9bcce09dc 100644 --- a/deps/openssl/openssl.gypi +++ b/deps/openssl/openssl.gypi @@ -4,7 +4,6 @@ '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', @@ -23,17 +22,18 @@ 'openssl/ssl/s2_pkt.c', 'openssl/ssl/s2_srvr.c', 'openssl/ssl/s3_both.c', + 'openssl/ssl/s3_cbc.c', 'openssl/ssl/s3_clnt.c', 'openssl/ssl/s3_enc.c', 'openssl/ssl/s3_lib.c', 'openssl/ssl/s3_meth.c', 'openssl/ssl/s3_pkt.c', 'openssl/ssl/s3_srvr.c', - 'openssl/ssl/s3_cbc.c', 'openssl/ssl/ssl_algs.c', 'openssl/ssl/ssl_asn1.c', 'openssl/ssl/ssl_cert.c', 'openssl/ssl/ssl_ciph.c', + 'openssl/ssl/ssl_conf.c', 'openssl/ssl/ssl_err.c', 'openssl/ssl/ssl_err2.c', 'openssl/ssl/ssl_lib.c', @@ -41,12 +41,15 @@ 'openssl/ssl/ssl_sess.c', 'openssl/ssl/ssl_stat.c', 'openssl/ssl/ssl_txt.c', + 'openssl/ssl/ssl_utst.c', 'openssl/ssl/t1_clnt.c', 'openssl/ssl/t1_enc.c', + 'openssl/ssl/t1_ext.c', 'openssl/ssl/t1_lib.c', 'openssl/ssl/t1_meth.c', 'openssl/ssl/t1_reneg.c', 'openssl/ssl/t1_srvr.c', + 'openssl/ssl/t1_trce.c', 'openssl/ssl/tls_srp.c', 'openssl/crypto/aes/aes_cfb.c', 'openssl/crypto/aes/aes_ctr.c', @@ -206,6 +209,7 @@ 'openssl/crypto/cms/cms_err.c', 'openssl/crypto/cms/cms_ess.c', 'openssl/crypto/cms/cms_io.c', + 'openssl/crypto/cms/cms_kari.c', 'openssl/crypto/cms/cms_lib.c', 'openssl/crypto/cms/cms_pwri.c', 'openssl/crypto/cms/cms_sd.c', @@ -254,10 +258,12 @@ 'openssl/crypto/dh/dh_depr.c', 'openssl/crypto/dh/dh_err.c', 'openssl/crypto/dh/dh_gen.c', + 'openssl/crypto/dh/dh_kdf.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/dh/dh_rfc5114.c', 'openssl/crypto/dsa/dsa_ameth.c', 'openssl/crypto/dsa/dsa_asn1.c', 'openssl/crypto/dsa/dsa_depr.c', @@ -305,6 +311,7 @@ 'openssl/crypto/ec/ecp_oct.c', 'openssl/crypto/ec/ecp_smpl.c', 'openssl/crypto/ecdh/ech_err.c', + 'openssl/crypto/ecdh/ech_kdf.c', 'openssl/crypto/ecdh/ech_key.c', 'openssl/crypto/ecdh/ech_lib.c', 'openssl/crypto/ecdh/ech_ossl.c', @@ -327,7 +334,6 @@ 'openssl/crypto/engine/eng_openssl.c', 'openssl/crypto/engine/eng_pkey.c', 'openssl/crypto/engine/eng_rdrand.c', - 'openssl/crypto/engine/eng_rsax.c', 'openssl/crypto/engine/eng_table.c', 'openssl/crypto/engine/tb_asnmth.c', 'openssl/crypto/engine/tb_cipher.c', @@ -353,6 +359,7 @@ 'openssl/crypto/evp/digest.c', 'openssl/crypto/evp/e_aes.c', 'openssl/crypto/evp/e_aes_cbc_hmac_sha1.c', + 'openssl/crypto/evp/e_aes_cbc_hmac_sha256.c', 'openssl/crypto/evp/e_bf.c', 'openssl/crypto/evp/e_camellia.c', 'openssl/crypto/evp/e_cast.c', @@ -372,7 +379,6 @@ 'openssl/crypto/evp/evp_cnf.c', 'openssl/crypto/evp/evp_enc.c', 'openssl/crypto/evp/evp_err.c', - 'openssl/crypto/evp/evp_fips.c', 'openssl/crypto/evp/evp_key.c', 'openssl/crypto/evp/evp_lib.c', 'openssl/crypto/evp/evp_pbe.c', @@ -416,8 +422,6 @@ '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', @@ -433,6 +437,7 @@ 'openssl/crypto/modes/cts128.c', 'openssl/crypto/modes/gcm128.c', 'openssl/crypto/modes/ofb128.c', + 'openssl/crypto/modes/wrap128.c', 'openssl/crypto/modes/xts128.c', 'openssl/crypto/o_dir.c', 'openssl/crypto/o_fips.c', @@ -540,10 +545,6 @@ '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', @@ -556,7 +557,6 @@ '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', @@ -619,6 +619,7 @@ 'openssl/crypto/x509v3/v3_pmaps.c', 'openssl/crypto/x509v3/v3_prn.c', 'openssl/crypto/x509v3/v3_purp.c', + 'openssl/crypto/x509v3/v3_scts.c', 'openssl/crypto/x509v3/v3_skey.c', 'openssl/crypto/x509v3/v3_sxnet.c', 'openssl/crypto/x509v3/v3_utl.c', @@ -632,7 +633,7 @@ 'openssl/engines/e_gmp.c', 'openssl/engines/e_nuron.c', 'openssl/engines/e_sureware.c', - 'openssl/engines/e_ubsec.c' + 'openssl/engines/e_ubsec.c', ], 'openssl_sources_no_asm': [ 'openssl/crypto/aes/aes_cbc.c', @@ -654,16 +655,17 @@ 'asm/x86-elf-gas/aes/aes-586.s', 'asm/x86-elf-gas/aes/aesni-x86.s', 'asm/x86-elf-gas/aes/vpaes-x86.s', - 'asm/x86-elf-gas/bf/bf-686.s', + 'asm/x86-elf-gas/bf/bf-586.s', + 'asm/x86-elf-gas/bn/bn-586.s', + 'asm/x86-elf-gas/bn/co-586.s', 'asm/x86-elf-gas/bn/x86-mont.s', - 'asm/x86-elf-gas/bn/x86.s', + 'asm/x86-elf-gas/bn/x86-gf2m.s', 'asm/x86-elf-gas/camellia/cmll-x86.s', 'asm/x86-elf-gas/cast/cast-586.s', 'asm/x86-elf-gas/des/crypt586.s', 'asm/x86-elf-gas/des/des-586.s', 'asm/x86-elf-gas/md5/md5-586.s', 'asm/x86-elf-gas/rc4/rc4-586.s', - 'asm/x86-elf-gas/rc5/rc5-586.s', 'asm/x86-elf-gas/ripemd/rmd-586.s', 'asm/x86-elf-gas/sha/sha1-586.s', 'asm/x86-elf-gas/sha/sha256-586.s', @@ -675,47 +677,58 @@ ], 'openssl_sources_x64_elf_gas': [ 'asm/x64-elf-gas/aes/aes-x86_64.s', + 'asm/x64-elf-gas/aes/aesni-mb-x86_64.s', + 'asm/x64-elf-gas/aes/aesni-sha256-x86_64.s', 'asm/x64-elf-gas/aes/aesni-x86_64.s', 'asm/x64-elf-gas/aes/vpaes-x86_64.s', 'asm/x64-elf-gas/aes/bsaes-x86_64.s', 'asm/x64-elf-gas/aes/aesni-sha1-x86_64.s', - 'asm/x64-elf-gas/bn/modexp512-x86_64.s', + 'asm/x64-elf-gas/bn/rsaz-avx2.s', + 'asm/x64-elf-gas/bn/rsaz-x86_64.s', 'asm/x64-elf-gas/bn/x86_64-mont.s', 'asm/x64-elf-gas/bn/x86_64-mont5.s', 'asm/x64-elf-gas/bn/x86_64-gf2m.s', 'asm/x64-elf-gas/camellia/cmll-x86_64.s', + 'asm/x64-elf-gas/ec/ecp_nistz256-x86_64.s', 'asm/x64-elf-gas/md5/md5-x86_64.s', 'asm/x64-elf-gas/rc4/rc4-x86_64.s', 'asm/x64-elf-gas/rc4/rc4-md5-x86_64.s', + 'asm/x64-elf-gas/sha/sha1-mb-x86_64.s', 'asm/x64-elf-gas/sha/sha1-x86_64.s', + 'asm/x64-elf-gas/sha/sha256-mb-x86_64.s', 'asm/x64-elf-gas/sha/sha256-x86_64.s', 'asm/x64-elf-gas/sha/sha512-x86_64.s', 'asm/x64-elf-gas/whrlpool/wp-x86_64.s', + 'asm/x64-elf-gas/modes/aesni-gcm-x86_64.s', 'asm/x64-elf-gas/modes/ghash-x86_64.s', 'asm/x64-elf-gas/x86_64cpuid.s', # Non-generated asm 'openssl/crypto/bn/asm/x86_64-gcc.c', # No asm available 'openssl/crypto/bf/bf_enc.c', + 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/cast/c_enc.c', 'openssl/crypto/camellia/cmll_misc.c', 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c' + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/ec/ecp_nistz256.c', + 'openssl/crypto/ui/ui_compat.c' ], 'openssl_sources_ia32_mac_gas': [ 'asm/x86-macosx-gas/aes/aes-586.s', 'asm/x86-macosx-gas/aes/aesni-x86.s', 'asm/x86-macosx-gas/aes/vpaes-x86.s', - 'asm/x86-macosx-gas/bf/bf-686.s', + 'asm/x86-macosx-gas/bf/bf-586.s', + 'asm/x86-macosx-gas/bn/bn-586.s', + 'asm/x86-macosx-gas/bn/co-586.s', 'asm/x86-macosx-gas/bn/x86-mont.s', - 'asm/x86-macosx-gas/bn/x86.s', + 'asm/x86-macosx-gas/bn/x86-gf2m.s', 'asm/x86-macosx-gas/camellia/cmll-x86.s', 'asm/x86-macosx-gas/cast/cast-586.s', 'asm/x86-macosx-gas/des/crypt586.s', 'asm/x86-macosx-gas/des/des-586.s', 'asm/x86-macosx-gas/md5/md5-586.s', 'asm/x86-macosx-gas/rc4/rc4-586.s', - 'asm/x86-macosx-gas/rc5/rc5-586.s', 'asm/x86-macosx-gas/ripemd/rmd-586.s', 'asm/x86-macosx-gas/sha/sha1-586.s', 'asm/x86-macosx-gas/sha/sha256-586.s', @@ -723,45 +736,58 @@ 'asm/x86-macosx-gas/whrlpool/wp-mmx.s', 'asm/x86-macosx-gas/modes/ghash-x86.s', 'asm/x86-macosx-gas/x86cpuid.s', - 'openssl/crypto/whrlpool/wp_block.c' + 'openssl/crypto/whrlpool/wp_block.c', ], 'openssl_sources_x64_mac_gas': [ 'asm/x64-macosx-gas/aes/aes-x86_64.s', 'asm/x64-macosx-gas/aes/aesni-x86_64.s', 'asm/x64-macosx-gas/aes/vpaes-x86_64.s', + 'asm/x64-macosx-gas/aes/aesni-mb-x86_64.s', + 'asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s', 'asm/x64-macosx-gas/aes/bsaes-x86_64.s', 'asm/x64-macosx-gas/aes/aesni-sha1-x86_64.s', - 'asm/x64-macosx-gas/bn/modexp512-x86_64.s', + 'asm/x64-macosx-gas/bn/rsaz-avx2.s', + 'asm/x64-macosx-gas/bn/rsaz-x86_64.s', 'asm/x64-macosx-gas/bn/x86_64-mont.s', 'asm/x64-macosx-gas/bn/x86_64-mont5.s', 'asm/x64-macosx-gas/bn/x86_64-gf2m.s', 'asm/x64-macosx-gas/camellia/cmll-x86_64.s', + 'asm/x64-macosx-gas/ec/ecp_nistz256-x86_64.s', 'asm/x64-macosx-gas/md5/md5-x86_64.s', - 'asm/x64-macosx-gas/rc4/rc4-x86_64.s', - 'asm/x64-macosx-gas/rc4/rc4-md5-x86_64.s', + 'asm/x64-macosx-gas/sha/sha1-mb-x86_64.s', 'asm/x64-macosx-gas/sha/sha1-x86_64.s', + 'asm/x64-macosx-gas/sha/sha256-mb-x86_64.s', 'asm/x64-macosx-gas/sha/sha256-x86_64.s', 'asm/x64-macosx-gas/sha/sha512-x86_64.s', 'asm/x64-macosx-gas/whrlpool/wp-x86_64.s', + 'asm/x64-macosx-gas/modes/aesni-gcm-x86_64.s', 'asm/x64-macosx-gas/modes/ghash-x86_64.s', 'asm/x64-macosx-gas/x86_64cpuid.s', # Non-generated asm 'openssl/crypto/bn/asm/x86_64-gcc.c', # No asm available 'openssl/crypto/bf/bf_enc.c', + 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/cast/c_enc.c', 'openssl/crypto/camellia/cmll_misc.c', 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c' + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/ec/ecp_nistz256.c', + 'openssl/crypto/ui/ui_compat.c', + 'openssl/crypto/rc4/rc4_skey.c', + 'openssl/crypto/rc4/rc4_enc.c', ], - 'openssl_sources_arm_elf_gas': [ - 'asm/arm-elf-gas/aes/aes-armv4.s', - 'asm/arm-elf-gas/bn/armv4-mont.s', - 'asm/arm-elf-gas/bn/armv4-gf2m.s', - 'asm/arm-elf-gas/sha/sha1-armv4-large.s', - 'asm/arm-elf-gas/sha/sha512-armv4.s', - 'asm/arm-elf-gas/sha/sha256-armv4.s', - 'asm/arm-elf-gas/modes/ghash-armv4.s', + 'openssl_sources_arm_void_gas': [ + 'asm/arm-void-gas/aes/aes-armv4.S', + 'asm/arm-void-gas/aes/bsaes-armv7.S', + 'asm/arm-void-gas/aes/aesv8-armx.S', + 'asm/arm-void-gas/bn/armv4-mont.S', + 'asm/arm-void-gas/bn/armv4-gf2m.S', + 'asm/arm-void-gas/sha/sha1-armv4-large.S', + 'asm/arm-void-gas/sha/sha512-armv4.S', + 'asm/arm-void-gas/sha/sha256-armv4.S', + 'asm/arm-void-gas/modes/ghash-armv4.S', + 'asm/arm-void-gas/modes/ghashv8-armx.S', # No asm available 'openssl/crypto/aes/aes_cbc.c', 'openssl/crypto/bf/bf_enc.c', @@ -774,25 +800,52 @@ 'openssl/crypto/des/fcrypt_b.c', 'openssl/crypto/rc4/rc4_enc.c', 'openssl/crypto/rc4/rc4_skey.c', + 'openssl/crypto/ui/ui_compat.c', 'openssl/crypto/whrlpool/wp_block.c', # PCAP stuff 'openssl/crypto/armcap.c', 'openssl/crypto/armv4cpuid.S', ], + 'openssl_sources_arm64_linux64_gas': [ + 'asm/arm64-linux64-gas/aes/aesv8-armx.S', + 'asm/arm64-linux64-gas/modes/ghashv8-armx.S', + 'asm/arm64-linux64-gas/sha/sha1-armv8.S', + 'asm/arm64-linux64-gas/sha/sha256-armv8.S', + 'asm/arm64-linux64-gas/sha/sha512-armv8.S', + # No asm available + 'openssl/crypto/aes/aes_core.c', + 'openssl/crypto/aes/aes_cbc.c', + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/bf/bf_enc.c', + 'openssl/crypto/cast/c_enc.c', + 'openssl/crypto/camellia/camellia.c', + 'openssl/crypto/camellia/cmll_cbc.c', + 'openssl/crypto/camellia/cmll_misc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/rc4/rc4_enc.c', + 'openssl/crypto/rc4/rc4_skey.c', + 'openssl/crypto/whrlpool/wp_block.c', + 'openssl/crypto/mem_clr.c', + # PCAP stuff + 'openssl/crypto/armcap.c', + 'openssl/crypto/arm64cpuid.S', + ], 'openssl_sources_ia32_win_masm': [ 'asm/x86-win32-masm/aes/aes-586.asm', 'asm/x86-win32-masm/aes/aesni-x86.asm', 'asm/x86-win32-masm/aes/vpaes-x86.asm', - 'asm/x86-win32-masm/bf/bf-686.asm', + 'asm/x86-win32-masm/bf/bf-586.asm', + 'asm/x86-win32-masm/bn/bn-586.asm', + 'asm/x86-win32-masm/bn/co-586.asm', 'asm/x86-win32-masm/bn/x86-mont.asm', - 'asm/x86-win32-masm/bn/x86.asm', + 'asm/x86-win32-masm/bn/x86-gf2m.asm', 'asm/x86-win32-masm/camellia/cmll-x86.asm', 'asm/x86-win32-masm/cast/cast-586.asm', 'asm/x86-win32-masm/des/crypt586.asm', 'asm/x86-win32-masm/des/des-586.asm', 'asm/x86-win32-masm/md5/md5-586.asm', 'asm/x86-win32-masm/rc4/rc4-586.asm', - 'asm/x86-win32-masm/rc5/rc5-586.asm', 'asm/x86-win32-masm/ripemd/rmd-586.asm', 'asm/x86-win32-masm/sha/sha1-586.asm', 'asm/x86-win32-masm/sha/sha256-586.asm', @@ -805,30 +858,40 @@ 'openssl_sources_x64_win_masm': [ 'asm/x64-win32-masm/aes/aes-x86_64.asm', 'asm/x64-win32-masm/aes/aesni-x86_64.asm', + 'asm/x64-win32-masm/aes/aesni-mb-x86_64.asm', + 'asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm', 'asm/x64-win32-masm/aes/vpaes-x86_64.asm', 'asm/x64-win32-masm/aes/bsaes-x86_64.asm', 'asm/x64-win32-masm/aes/aesni-sha1-x86_64.asm', - 'asm/x64-win32-masm/bn/modexp512-x86_64.asm', + 'asm/x64-win32-masm/bn/rsaz-avx2.asm', + 'asm/x64-win32-masm/bn/rsaz-x86_64.asm', 'asm/x64-win32-masm/bn/x86_64-mont.asm', 'asm/x64-win32-masm/bn/x86_64-mont5.asm', 'asm/x64-win32-masm/bn/x86_64-gf2m.asm', 'asm/x64-win32-masm/camellia/cmll-x86_64.asm', + 'asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm', 'asm/x64-win32-masm/md5/md5-x86_64.asm', 'asm/x64-win32-masm/rc4/rc4-x86_64.asm', 'asm/x64-win32-masm/rc4/rc4-md5-x86_64.asm', + 'asm/x64-win32-masm/sha/sha1-mb-x86_64.asm', 'asm/x64-win32-masm/sha/sha1-x86_64.asm', + 'asm/x64-win32-masm/sha/sha256-mb-x86_64.asm', 'asm/x64-win32-masm/sha/sha256-x86_64.asm', 'asm/x64-win32-masm/sha/sha512-x86_64.asm', 'asm/x64-win32-masm/whrlpool/wp-x86_64.asm', + 'asm/x64-win32-masm/modes/aesni-gcm-x86_64.asm', 'asm/x64-win32-masm/modes/ghash-x86_64.asm', 'asm/x64-win32-masm/x86_64cpuid.asm', # No asm available 'openssl/crypto/bn/bn_asm.c', 'openssl/crypto/bf/bf_enc.c', + 'openssl/crypto/bn/rsaz_exp.c', 'openssl/crypto/cast/c_enc.c', 'openssl/crypto/camellia/cmll_misc.c', 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c' + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/ec/ecp_nistz256.c', + 'openssl/crypto/ui/ui_compat.c' ], 'openssl_cli_sources': [ 'openssl/apps/app_rand.c', @@ -893,6 +956,12 @@ 'SHA512_ASM', 'GHASH_ASM', ], + 'openssl_defines_arm64': [ + 'OPENSSL_CPUID_OBJ', + 'SHA1_ASM', + 'SHA256_ASM', + 'SHA512_ASM', + ], 'openssl_defines_non_arm': [ 'VPAES_ASM', 'BN_ASM', @@ -909,6 +978,11 @@ ], 'openssl_defines_all_win': [ 'DSO_WIN32', + '_CRT_SECURE_NO_DEPRECATE', + # following two defines are moved from openssconf.h + 'OPENSSL_NO_DYNAMIC_ENGINE', + # to avoid build errors on Win. See openssl/engines/e_capi.c + 'OPENSSL_NO_CAPIENG', ], 'openssl_defines_all_non_win': [ 'DSO_DLFCN', @@ -916,12 +990,15 @@ ], 'openssl_defines_ia32_elf': [ '<@(openssl_defines_non_arm)', + 'OPENSSL_BN_ASM_PART_WORDS', ], 'openssl_defines_ia32_mac': [ '<@(openssl_defines_non_arm)', + 'OPENSSL_BN_ASM_PART_WORDS', ], 'openssl_defines_ia32_win': [ '<@(openssl_defines_non_arm)', + 'OPENSSL_BN_ASM_PART_WORDS', ], 'openssl_defines_x64_elf': [ '<@(openssl_defines_non_arm)',