diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2019-09-13 09:16:08 -0700 |
---|---|---|
committer | Sam Roberts <vieuxtech@gmail.com> | 2019-10-01 11:11:13 -0700 |
commit | 1ca1e0163e62cd9df771a6f0809e30a3382c54b6 (patch) | |
tree | 12fbbade02d802388552060d6849fb80b5c07cb6 /deps/openssl/config/archs/VC-WIN32 | |
parent | 17d1d164418552089fcd72568e97a88b17ec1d21 (diff) | |
download | android-node-v8-1ca1e0163e62cd9df771a6f0809e30a3382c54b6.tar.gz android-node-v8-1ca1e0163e62cd9df771a6f0809e30a3382c54b6.tar.bz2 android-node-v8-1ca1e0163e62cd9df771a6f0809e30a3382c54b6.zip |
deps: update archs files for OpenSSL-1.1.1
After an OpenSSL source update, all the config files need to be
regenerated and comitted by:
$ cd deps/openssl/config
$ make
$ git add deps/openssl/config/archs
$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h
$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h
$ git add deps/openssl/openssl/include/openssl/opensslconf.h
$ git commit
PR-URL: https://github.com/nodejs/node/pull/29550
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'deps/openssl/config/archs/VC-WIN32')
10 files changed, 96 insertions, 56 deletions
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 112c031938..ecd5ebea5f 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -53,7 +53,7 @@ our %config = ( export_var_as_fn => "1", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AES_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", minor => "1.1", @@ -115,8 +115,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -132,11 +132,11 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x557a75a28f28)", + RANLIB => "CODE(0x56535777ac98)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], - aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s", - aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o", + aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s", + aes_obj => "aes_core.o aes_cbc.o vpaes-x86.o aesni-x86.o", apps_aux_src => "win32_init.c", apps_init_src => "", apps_obj => "win32_init.o", @@ -1714,8 +1714,9 @@ our %unified_info = ( { "deps" => [ - "crypto/aes/aes-586.o", + "crypto/aes/aes_cbc.o", "crypto/aes/aes_cfb.o", + "crypto/aes/aes_core.o", "crypto/aes/aes_ecb.o", "crypto/aes/aes_ige.o", "crypto/aes/aes_misc.o", @@ -3256,6 +3257,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -4891,12 +4893,6 @@ our %unified_info = ( "include", "apps", ], - "crypto/aes/aes-586.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/aes/aes-armv4.o" => [ "crypto", @@ -4913,12 +4909,24 @@ our %unified_info = ( [ "crypto", ], + "crypto/aes/aes_cbc.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/aes/aes_cfb.o" => [ ".", "crypto/include", "include", ], + "crypto/aes/aes_core.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/aes/aes_ecb.o" => [ ".", @@ -7897,10 +7905,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/poly1305/poly1305-s390x.o" => - [ - "crypto", - ], "crypto/poly1305/poly1305-sparcv9.o" => [ "crypto", @@ -10035,6 +10039,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/random.o" => + [ + "include", + ], "test/testutil/stanza.o" => [ "include", @@ -10646,14 +10654,18 @@ our %unified_info = ( [ "apps/x509.c", ], - "crypto/aes/aes-586.o" => + "crypto/aes/aes_cbc.o" => [ - "crypto/aes/aes-586.s", + "crypto/aes/aes_cbc.c", ], "crypto/aes/aes_cfb.o" => [ "crypto/aes/aes_cfb.c", ], + "crypto/aes/aes_core.o" => + [ + "crypto/aes/aes_core.c", + ], "crypto/aes/aes_ecb.o" => [ "crypto/aes/aes_ecb.c", @@ -13343,8 +13355,9 @@ our %unified_info = ( ], "libcrypto" => [ - "crypto/aes/aes-586.o", + "crypto/aes/aes_cbc.o", "crypto/aes/aes_cfb.o", + "crypto/aes/aes_core.o", "crypto/aes/aes_ecb.o", "crypto/aes/aes_ige.o", "crypto/aes/aes_misc.o", @@ -15246,6 +15259,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -15591,6 +15605,10 @@ our %unified_info = ( [ "test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "test/testutil/stanza.c", diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index 058b2db124..b0dfdc7a56 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jun 12 20:57:03 2019 UTC" +#define DATE "built on: Fri Sep 13 16:03:33 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi index 0599fc39d8..5028da71f3 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi @@ -20,7 +20,6 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', - 'AES_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index e5baf5bc16..a718f985ec 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -45,7 +45,9 @@ 'openssl/ssl/t1_trce.c', 'openssl/ssl/tls13_enc.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_ecb.c', 'openssl/crypto/aes/aes_ige.c', 'openssl/crypto/aes/aes_misc.c', @@ -671,7 +673,6 @@ 'openssl/engines/e_padlock.c', ], 'openssl_sources_VC-WIN32': [ - './config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm', './config/archs/VC-WIN32/asm/crypto/aes/aesni-x86.asm', './config/archs/VC-WIN32/asm/crypto/aes/vpaes-x86.asm', './config/archs/VC-WIN32/asm/crypto/bf/bf-586.asm', @@ -716,7 +717,6 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', - 'AES_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm index ed6c58379c..f0ae44934c 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -53,7 +53,7 @@ our %config = ( export_var_as_fn => "1", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AES_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", minor => "1.1", @@ -115,8 +115,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -132,11 +132,11 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x558cc0187db8)", + RANLIB => "CODE(0x55a934dbe798)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], - aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s", - aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o", + aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s", + aes_obj => "aes_core.o aes_cbc.o vpaes-x86.o aesni-x86.o", apps_aux_src => "win32_init.c", apps_init_src => "", apps_obj => "win32_init.o", @@ -1714,8 +1714,9 @@ our %unified_info = ( { "deps" => [ - "crypto/aes/aes-586.o", + "crypto/aes/aes_cbc.o", "crypto/aes/aes_cfb.o", + "crypto/aes/aes_core.o", "crypto/aes/aes_ecb.o", "crypto/aes/aes_ige.o", "crypto/aes/aes_misc.o", @@ -3256,6 +3257,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -4891,12 +4893,6 @@ our %unified_info = ( "include", "apps", ], - "crypto/aes/aes-586.o" => - [ - ".", - "crypto/include", - "include", - ], "crypto/aes/aes-armv4.o" => [ "crypto", @@ -4913,12 +4909,24 @@ our %unified_info = ( [ "crypto", ], + "crypto/aes/aes_cbc.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/aes/aes_cfb.o" => [ ".", "crypto/include", "include", ], + "crypto/aes/aes_core.o" => + [ + ".", + "crypto/include", + "include", + ], "crypto/aes/aes_ecb.o" => [ ".", @@ -7897,10 +7905,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/poly1305/poly1305-s390x.o" => - [ - "crypto", - ], "crypto/poly1305/poly1305-sparcv9.o" => [ "crypto", @@ -10035,6 +10039,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/random.o" => + [ + "include", + ], "test/testutil/stanza.o" => [ "include", @@ -10646,14 +10654,18 @@ our %unified_info = ( [ "apps/x509.c", ], - "crypto/aes/aes-586.o" => + "crypto/aes/aes_cbc.o" => [ - "crypto/aes/aes-586.s", + "crypto/aes/aes_cbc.c", ], "crypto/aes/aes_cfb.o" => [ "crypto/aes/aes_cfb.c", ], + "crypto/aes/aes_core.o" => + [ + "crypto/aes/aes_core.c", + ], "crypto/aes/aes_ecb.o" => [ "crypto/aes/aes_ecb.c", @@ -13343,8 +13355,9 @@ our %unified_info = ( ], "libcrypto" => [ - "crypto/aes/aes-586.o", + "crypto/aes/aes_cbc.o", "crypto/aes/aes_cfb.o", + "crypto/aes/aes_core.o", "crypto/aes/aes_ecb.o", "crypto/aes/aes_ige.o", "crypto/aes/aes_misc.o", @@ -15246,6 +15259,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -15591,6 +15605,10 @@ our %unified_info = ( [ "test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "test/testutil/stanza.c", diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h index 4c99371458..6aeb27ba40 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jun 12 20:57:08 2019 UTC" +#define DATE "built on: Fri Sep 13 16:03:39 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi index 0599fc39d8..5028da71f3 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi @@ -20,7 +20,6 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', - 'AES_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi index e0d6a8f136..a5bb5f58ee 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -45,7 +45,9 @@ 'openssl/ssl/t1_trce.c', 'openssl/ssl/tls13_enc.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_ecb.c', 'openssl/crypto/aes/aes_ige.c', 'openssl/crypto/aes/aes_misc.c', @@ -671,7 +673,6 @@ 'openssl/engines/e_padlock.c', ], 'openssl_sources_VC-WIN32': [ - './config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm', './config/archs/VC-WIN32/asm_avx2/crypto/aes/aesni-x86.asm', './config/archs/VC-WIN32/asm_avx2/crypto/aes/vpaes-x86.asm', './config/archs/VC-WIN32/asm_avx2/crypto/bf/bf-586.asm', @@ -716,7 +717,6 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', - 'AES_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index 4441443ea3..16ff6d9820 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -114,8 +114,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -131,7 +131,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x55bca9ad89d8)", + RANLIB => "CODE(0x55ddfff979c8)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c", @@ -3242,6 +3242,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -7853,10 +7854,6 @@ our %unified_info = ( [ "crypto", ], - "crypto/poly1305/poly1305-s390x.o" => - [ - "crypto", - ], "crypto/poly1305/poly1305-sparcv9.o" => [ "crypto", @@ -9949,6 +9946,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/random.o" => + [ + "include", + ], "test/testutil/stanza.o" => [ "include", @@ -15100,6 +15101,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -15445,6 +15447,10 @@ our %unified_info = ( [ "test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "test/testutil/stanza.c", diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index c94d1e62d7..916cdacd50 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Jun 12 20:57:14 2019 UTC" +#define DATE "built on: Fri Sep 13 16:03:44 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a |