diff --git a/deps/openssl/config/.generate_gypi.pl.swp b/deps/openssl/config/.generate_gypi.pl.swp new file mode 100644 index 00000000000000..e0148c1a92f4df Binary files /dev/null and b/deps/openssl/config/.generate_gypi.pl.swp differ diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index f16d6bdf7dd75e..bc655e73773808 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -206,7 +206,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9714,10 +9714,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27216,8 +27216,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27244,7 +27244,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27261,8 +27261,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h index e72c0c3c82fd89..be33f0e3de2fbb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Wed Sep 8 06:02:47 2021 UTC" +#define DATE "built on: Sat Oct 16 04:06:33 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi index 9ddc5c99b88ed1..4cd3da31570280 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/BSD-x86/asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86/asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86/asm/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86/asm/crypto/bn/bn-586.s', - './config/archs/BSD-x86/asm/crypto/bn/co-586.s', - './config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.s', - './config/archs/BSD-x86/asm/crypto/bn/x86-mont.s', - './config/archs/BSD-x86/asm/crypto/des/crypt586.s', - './config/archs/BSD-x86/asm/crypto/des/des-586.s', - './config/archs/BSD-x86/asm/crypto/md5/md5-586.s', + './config/archs/BSD-x86/asm/providers/legacy.ld', './config/archs/BSD-x86/asm/providers/fips.ld', ], @@ -337,7 +331,7 @@ 'openssl_ex_libs_BSD-x86': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -349,7 +343,7 @@ 'defines': ['<@(openssl_defines_BSD-x86)'], 'cflags': ['<@(openssl_cflags_BSD-x86)'], 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-legacy.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..35098ea4f8d22d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-legacy.gypi @@ -0,0 +1,76 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_BSD-x86': [ + + ], + 'openssl_defines_BSD-x86': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_BSD-x86': [ + '-Wa,--noexecstack', + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_BSD-x86': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_BSD-x86)'], + 'cflags': ['<@(openssl_cflags_BSD-x86)'], + 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_BSD-x86)'], + }, +} diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi index 14862390ff2769..1ab613ef7a7fbd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi @@ -912,34 +912,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_BSD-x86': [ './config/archs/BSD-x86/asm/crypto/aes/aes-586.s', @@ -973,13 +945,7 @@ './config/archs/BSD-x86/asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86/asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86/asm/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86/asm/crypto/bn/bn-586.s', - './config/archs/BSD-x86/asm/crypto/bn/co-586.s', - './config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.s', - './config/archs/BSD-x86/asm/crypto/bn/x86-mont.s', - './config/archs/BSD-x86/asm/crypto/des/crypt586.s', - './config/archs/BSD-x86/asm/crypto/des/des-586.s', - './config/archs/BSD-x86/asm/crypto/md5/md5-586.s', + './config/archs/BSD-x86/asm/providers/legacy.ld', './config/archs/BSD-x86/asm/providers/fips.ld', ], 'openssl_defines_BSD-x86': [ diff --git a/deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm index 0c82a9de973d46..2a3a61b15134fe 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -206,7 +206,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27216,8 +27216,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27244,7 +27244,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27261,8 +27261,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h index 5faedf327b4e3f..c6eb3625cf9e86 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Wed Sep 8 06:02:59 2021 UTC" +#define DATE "built on: Sat Oct 16 04:06:48 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi index 9386655bd4463f..ee234e5dc31bce 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/BSD-x86/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.s', - './config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.s', - './config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s', - './config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s', - './config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s', + './config/archs/BSD-x86/asm_avx2/providers/legacy.ld', './config/archs/BSD-x86/asm_avx2/providers/fips.ld', ], @@ -337,7 +331,7 @@ 'openssl_ex_libs_BSD-x86': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -349,7 +343,7 @@ 'defines': ['<@(openssl_defines_BSD-x86)'], 'cflags': ['<@(openssl_cflags_BSD-x86)'], 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..35098ea4f8d22d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,76 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_BSD-x86': [ + + ], + 'openssl_defines_BSD-x86': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_BSD-x86': [ + '-Wa,--noexecstack', + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_BSD-x86': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_BSD-x86)'], + 'cflags': ['<@(openssl_cflags_BSD-x86)'], + 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_BSD-x86)'], + }, +} diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi index 03b719f85c3309..62e4cdf8a5473b 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi @@ -912,34 +912,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_BSD-x86': [ './config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s', @@ -973,13 +945,7 @@ './config/archs/BSD-x86/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.s', - './config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.s', - './config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s', - './config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s', - './config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s', + './config/archs/BSD-x86/asm_avx2/providers/legacy.ld', './config/archs/BSD-x86/asm_avx2/providers/fips.ld', ], 'openssl_defines_BSD-x86': [ diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm index 96d9ef1697d9a7..d244b8fee5deae 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -205,7 +205,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7937,9 +7937,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7957,7 +7954,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9632,10 +9632,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27033,8 +27033,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27061,7 +27061,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27078,8 +27078,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h index 603da810e00854..d57ae1dce216d3 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Wed Sep 8 06:03:11 2021 UTC" +#define DATE "built on: Sat Oct 16 04:07:04 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi index 5b469bb5b7d1b7..5f290841677570 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/BSD-x86/no-asm/providers/legacy.ld', './config/archs/BSD-x86/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_BSD-x86': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_BSD-x86)'], 'cflags': ['<@(openssl_cflags_BSD-x86)'], 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..92dd8c6aad55a9 --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_BSD-x86': [ + + ], + 'openssl_defines_BSD-x86': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_BSD-x86': [ + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_BSD-x86': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_BSD-x86)'], + 'cflags': ['<@(openssl_cflags_BSD-x86)'], + 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_BSD-x86)'], + }, +} diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi index 3080ae7b182213..2087b270d8618c 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi @@ -924,37 +924,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_BSD-x86': [ './config/archs/BSD-x86/no-asm/providers/common/der/der_sm2_gen.c', @@ -964,6 +933,7 @@ './config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/BSD-x86/no-asm/providers/legacy.ld', './config/archs/BSD-x86/no-asm/providers/fips.ld', ], 'openssl_defines_BSD-x86': [ diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index 5c7de537a7c46d..e92b783d26857f 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -206,7 +206,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7997,9 +7997,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8017,7 +8014,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9760,10 +9760,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27386,8 +27386,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27414,7 +27414,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27431,8 +27431,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 6634ec43e9b288..c1741caa0126bd 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Sep 8 06:03:21 2021 UTC" +#define DATE "built on: Sat Oct 16 04:07:17 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi index 7aeb550438b330..b1391f3c9056e7 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/BSD-x86_64/asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86_64/asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86_64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s', - './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx512.s', - './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s', - './config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s', - './config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s', + './config/archs/BSD-x86_64/asm/providers/legacy.ld', './config/archs/BSD-x86_64/asm/providers/fips.ld', ], @@ -351,7 +345,7 @@ 'openssl_ex_libs_BSD-x86_64': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -363,7 +357,7 @@ 'defines': ['<@(openssl_defines_BSD-x86_64)'], 'cflags': ['<@(openssl_cflags_BSD-x86_64)'], 'libraries': ['<@(openssl_ex_libs_BSD-x86_64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-legacy.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..e0ec19732e0453 --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-legacy.gypi @@ -0,0 +1,80 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_BSD-x86_64': [ + + ], + 'openssl_defines_BSD-x86_64': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_BSD-x86_64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_BSD-x86_64': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_BSD-x86_64)'], + 'cflags': ['<@(openssl_cflags_BSD-x86_64)'], + 'libraries': ['<@(openssl_ex_libs_BSD-x86_64)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_BSD-x86_64)'], + }, +} diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index cc5c6c6bfb96e5..bb322a5a294728 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -917,39 +917,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_BSD-x86_64': [ './config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s', @@ -991,13 +958,7 @@ './config/archs/BSD-x86_64/asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86_64/asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86_64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s', - './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx512.s', - './config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/BSD-x86_64/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont.s', - './config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s', - './config/archs/BSD-x86_64/asm/crypto/md5/md5-x86_64.s', + './config/archs/BSD-x86_64/asm/providers/legacy.ld', './config/archs/BSD-x86_64/asm/providers/fips.ld', ], 'openssl_defines_BSD-x86_64': [ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86_64/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86_64/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index 0a494bb739cc2f..29d206d6fb0505 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm @@ -206,7 +206,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27386,8 +27386,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27414,7 +27414,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27431,8 +27431,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h index 2e9966cf66c09f..732a4c27a66f3e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Sep 8 06:03:36 2021 UTC" +#define DATE "built on: Sat Oct 16 04:07:36 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi index 8445b16e799c91..c1357e6fd38741 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/BSD-x86_64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86_64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86_64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/BSD-x86_64/asm_avx2/providers/legacy.ld', './config/archs/BSD-x86_64/asm_avx2/providers/fips.ld', ], @@ -351,7 +345,7 @@ 'openssl_ex_libs_BSD-x86_64': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -363,7 +357,7 @@ 'defines': ['<@(openssl_defines_BSD-x86_64)'], 'cflags': ['<@(openssl_cflags_BSD-x86_64)'], 'libraries': ['<@(openssl_ex_libs_BSD-x86_64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..e0ec19732e0453 --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,80 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_BSD-x86_64': [ + + ], + 'openssl_defines_BSD-x86_64': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_BSD-x86_64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_BSD-x86_64': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_BSD-x86_64)'], + 'cflags': ['<@(openssl_cflags_BSD-x86_64)'], + 'libraries': ['<@(openssl_ex_libs_BSD-x86_64)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_BSD-x86_64)'], + }, +} diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index 3e29bb679fb7b7..892240f8f9fec0 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi @@ -917,39 +917,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_BSD-x86_64': [ './config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s', @@ -991,13 +958,7 @@ './config/archs/BSD-x86_64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86_64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86_64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/BSD-x86_64/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/BSD-x86_64/asm_avx2/providers/legacy.ld', './config/archs/BSD-x86_64/asm_avx2/providers/fips.ld', ], 'openssl_defines_BSD-x86_64': [ diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index a6b7c1cdce2bfb..c4b833d694931f 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -205,7 +205,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7938,6 +7938,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7955,10 +7958,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9633,10 +9633,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27034,8 +27034,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27062,7 +27062,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27079,8 +27079,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 39e839dcfdb1a2..589a8da948f576 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Wed Sep 8 06:03:51 2021 UTC" +#define DATE "built on: Sat Oct 16 04:07:54 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi index 04619f532b387c..edb78bde043cfa 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/BSD-x86_64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86_64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86_64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/BSD-x86_64/no-asm/providers/legacy.ld', './config/archs/BSD-x86_64/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_BSD-x86_64': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_BSD-x86_64)'], 'cflags': ['<@(openssl_cflags_BSD-x86_64)'], 'libraries': ['<@(openssl_ex_libs_BSD-x86_64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..1108da8b1d65f0 --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_BSD-x86_64': [ + + ], + 'openssl_defines_BSD-x86_64': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_BSD-x86_64': [ + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_BSD-x86_64': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_BSD-x86_64)'], + 'cflags': ['<@(openssl_cflags_BSD-x86_64)'], + 'libraries': ['<@(openssl_ex_libs_BSD-x86_64)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86_64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_BSD-x86_64)'], + }, +} diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi index 6eab3844d828ba..9972dc7356594a 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/openssl.gypi @@ -924,37 +924,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_BSD-x86_64': [ './config/archs/BSD-x86_64/no-asm/providers/common/der/der_sm2_gen.c', @@ -964,6 +933,7 @@ './config/archs/BSD-x86_64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/BSD-x86_64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/BSD-x86_64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/BSD-x86_64/no-asm/providers/legacy.ld', './config/archs/BSD-x86_64/no-asm/providers/fips.ld', ], 'openssl_defines_BSD-x86_64': [ diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/providers/legacy.ld b/deps/openssl/config/archs/BSD-x86_64/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 947f09f2519535..d6efa510ada2be 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -219,7 +219,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55bede9515e8)", + "RANLIB" => "CODE(0x555a40702e20)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -8047,9 +8047,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8069,7 +8066,10 @@ our %unified_info = ( "apps/lib/libapps-lib-tlssrp_depr.o", "apps/lib/libapps-lib-win32_init.o", "apps/lib/libtestutil-lib-opt.o", - "apps/lib/libtestutil-lib-win32_init.o" + "apps/lib/libtestutil-lib-win32_init.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9769,10 +9769,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27295,8 +27295,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27323,7 +27323,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27340,8 +27340,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 b588348f653d0f..261d2349a18eb6 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 Sep 8 06:14:07 2021 UTC" +#define DATE "built on: Sat Oct 16 04:20:39 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi index 92c8a31e9065e5..e9a9f991a77bd4 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/VC-WIN32/asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN32/asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN32/asm/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm', - './config/archs/VC-WIN32/asm/crypto/bn/co-586.asm', - './config/archs/VC-WIN32/asm/crypto/bn/x86-gf2m.asm', - './config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm', - './config/archs/VC-WIN32/asm/crypto/des/crypt586.asm', - './config/archs/VC-WIN32/asm/crypto/des/des-586.asm', - './config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm', + './config/archs/VC-WIN32/asm/providers/legacy.ld', './config/archs/VC-WIN32/asm/providers/fips.ld', ], @@ -342,7 +336,7 @@ 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..993af1076ecaa1 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-legacy.gypi @@ -0,0 +1,79 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN32': [ + + ], + 'openssl_defines_VC-WIN32': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_VC-WIN32': [ + '-Wa,--noexecstack', + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN32': [ + 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN32)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN32)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN32)'], + }, +} diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index e2d07e20088926..e00f0cbb643d49 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN32': [ './config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm', @@ -972,13 +944,7 @@ './config/archs/VC-WIN32/asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN32/asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN32/asm/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN32/asm/crypto/bn/bn-586.asm', - './config/archs/VC-WIN32/asm/crypto/bn/co-586.asm', - './config/archs/VC-WIN32/asm/crypto/bn/x86-gf2m.asm', - './config/archs/VC-WIN32/asm/crypto/bn/x86-mont.asm', - './config/archs/VC-WIN32/asm/crypto/des/crypt586.asm', - './config/archs/VC-WIN32/asm/crypto/des/des-586.asm', - './config/archs/VC-WIN32/asm/crypto/md5/md5-586.asm', + './config/archs/VC-WIN32/asm/providers/legacy.ld', './config/archs/VC-WIN32/asm/providers/fips.ld', ], 'openssl_defines_VC-WIN32': [ 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 174e124afc5a69..52e36f2d9826ec 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -219,7 +219,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x559905547078)", + "RANLIB" => "CODE(0x559da0a31980)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -8047,6 +8047,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8066,10 +8069,7 @@ our %unified_info = ( "apps/lib/libapps-lib-tlssrp_depr.o", "apps/lib/libapps-lib-win32_init.o", "apps/lib/libtestutil-lib-opt.o", - "apps/lib/libtestutil-lib-win32_init.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-win32_init.o" ], "products" => { "bin" => [ @@ -9769,10 +9769,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27295,8 +27295,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27323,7 +27323,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27340,8 +27340,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 730a2b571fce73..285aeadea9e6eb 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 Sep 8 06:14:17 2021 UTC" +#define DATE "built on: Sat Oct 16 04:20:53 2021 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-fips.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi index c9e7b8b7eb798c..6758270e89bfa9 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/bn-586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/co-586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/x86-gf2m.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/x86-mont.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/des/crypt586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/md5/md5-586.asm', + './config/archs/VC-WIN32/asm_avx2/providers/legacy.ld', './config/archs/VC-WIN32/asm_avx2/providers/fips.ld', ], @@ -342,7 +336,7 @@ 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..993af1076ecaa1 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,79 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN32': [ + + ], + 'openssl_defines_VC-WIN32': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_VC-WIN32': [ + '-Wa,--noexecstack', + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN32': [ + 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN32)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN32)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN32)'], + }, +} 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 ea45a9433881a7..208e05b48e42ef 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN32': [ './config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm', @@ -972,13 +944,7 @@ './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN32/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/bn-586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/co-586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/x86-gf2m.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/bn/x86-mont.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/des/crypt586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/des/des-586.asm', - './config/archs/VC-WIN32/asm_avx2/crypto/md5/md5-586.asm', + './config/archs/VC-WIN32/asm_avx2/providers/legacy.ld', './config/archs/VC-WIN32/asm_avx2/providers/fips.ld', ], 'openssl_defines_VC-WIN32': [ 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 8bb573716723fa..805c89b3b89ac5 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -218,7 +218,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55b654f5be48)", + "RANLIB" => "CODE(0x55eb381589d0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -27112,8 +27112,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27140,7 +27140,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27157,8 +27157,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ 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 b68810653a5d01..bc60c83af71087 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 Sep 8 06:14:28 2021 UTC" +#define DATE "built on: Sat Oct 16 04:21:07 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi index 5e8723028a63ba..d44c350427f26b 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/VC-WIN32/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN32/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN32/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/VC-WIN32/no-asm/providers/legacy.ld', './config/archs/VC-WIN32/no-asm/providers/fips.ld', ], @@ -302,7 +303,7 @@ 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..7243b1ea4ae860 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN32': [ + + ], + 'openssl_defines_VC-WIN32': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + ], + 'openssl_cflags_VC-WIN32': [ + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN32': [ + 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN32)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN32)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN32)'], + }, +} diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index 9700dc6767d8ae..a2748b0eb06efc 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN32': [ './config/archs/VC-WIN32/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/VC-WIN32/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN32/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN32/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/VC-WIN32/no-asm/providers/legacy.ld', './config/archs/VC-WIN32/no-asm/providers/fips.ld', ], 'openssl_defines_VC-WIN32': [ diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index 040462d02ec4a9..c30fc63b9d2756 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm @@ -216,7 +216,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55fbb514a2f8)", + "RANLIB" => "CODE(0x5608874d6fc0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -7983,9 +7983,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8005,7 +8002,10 @@ our %unified_info = ( "apps/lib/libapps-lib-tlssrp_depr.o", "apps/lib/libapps-lib-win32_init.o", "apps/lib/libtestutil-lib-opt.o", - "apps/lib/libtestutil-lib-win32_init.o" + "apps/lib/libtestutil-lib-win32_init.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27104,8 +27104,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27132,7 +27132,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27149,8 +27149,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h index b5bf868f771414..f9b65a09d2b585 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Wed Sep 8 06:14:37 2021 UTC" +#define DATE "built on: Sat Oct 16 04:21:19 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi index 540b40bf65da81..976b8383634fa0 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/VC-WIN64-ARM/no-asm/providers/legacy.ld', './config/archs/VC-WIN64-ARM/no-asm/providers/fips.ld', ], @@ -304,7 +305,7 @@ 'openssl_ex_libs_VC-WIN64-ARM': [ 'onecore.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..edc6061d55af84 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl-legacy.gypi @@ -0,0 +1,77 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN64-ARM': [ + + ], + 'openssl_defines_VC-WIN64-ARM': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + '_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE', + 'OPENSSL_SYS_WIN_CORE', + ], + 'openssl_cflags_VC-WIN64-ARM': [ + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN64-ARM': [ + 'onecore.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN64-ARM)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64-ARM)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN64-ARM)'], + }, +} diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi index 13c9896cd4873c..249e9470d637d4 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN64-ARM': [ './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64-ARM/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/VC-WIN64-ARM/no-asm/providers/legacy.ld', './config/archs/VC-WIN64-ARM/no-asm/providers/fips.ld', ], 'openssl_defines_VC-WIN64-ARM': [ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index 377e1a49c7c905..69f23b6db60d02 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -222,7 +222,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x559328a9f718)", + "RANLIB" => "CODE(0x556d6c29c0b0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -27457,8 +27457,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27485,7 +27485,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27502,8 +27502,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index 5128e97f8b09b8..bc8435bd2a8394 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Sep 8 06:13:28 2021 UTC" +#define DATE "built on: Sat Oct 16 04:19:52 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi index bbd25bcb02f54b..d74c2b7dd1e0b0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/VC-WIN64A/asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64A/asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64A/asm/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN64A/asm/crypto/bn/rsaz-avx2.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/rsaz-avx512.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/x86_64-gf2m.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm', - './config/archs/VC-WIN64A/asm/crypto/md5/md5-x86_64.asm', + './config/archs/VC-WIN64A/asm/providers/legacy.ld', './config/archs/VC-WIN64A/asm/providers/fips.ld', ], @@ -356,7 +350,7 @@ 'openssl_ex_libs_VC-WIN64A': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..e2a2d47078fc60 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-legacy.gypi @@ -0,0 +1,83 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN64A': [ + + ], + 'openssl_defines_VC-WIN64A': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_VC-WIN64A': [ + '-Wa,--noexecstack', + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN64A': [ + 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN64A)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64A)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN64A)'], + }, +} diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index a31b35aea81f4b..13f2a1085b1e07 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN64A': [ './config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm', @@ -990,13 +957,7 @@ './config/archs/VC-WIN64A/asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64A/asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64A/asm/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN64A/asm/crypto/bn/rsaz-avx2.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/rsaz-avx512.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/x86_64-gf2m.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont.asm', - './config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm', - './config/archs/VC-WIN64A/asm/crypto/md5/md5-x86_64.asm', + './config/archs/VC-WIN64A/asm/providers/legacy.ld', './config/archs/VC-WIN64A/asm/providers/fips.ld', ], 'openssl_defines_VC-WIN64A': [ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm index 10cb88c14aea8f..cff60070728b4d 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -222,7 +222,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55936d9e7178)", + "RANLIB" => "CODE(0x55e3b4f0a5b0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -9807,10 +9807,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27457,8 +27457,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27485,7 +27485,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27502,8 +27502,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h index 7c4cc9620e0ad3..1d0cb8630f975e 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Sep 8 06:13:43 2021 UTC" +#define DATE "built on: Sat Oct 16 04:20:10 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi index 9182f6f25c1bad..d90d6cabf9a771 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-avx2.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-avx512.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-gf2m.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/md5/md5-x86_64.asm', + './config/archs/VC-WIN64A/asm_avx2/providers/legacy.ld', './config/archs/VC-WIN64A/asm_avx2/providers/fips.ld', ], @@ -356,7 +350,7 @@ 'openssl_ex_libs_VC-WIN64A': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..e2a2d47078fc60 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,83 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN64A': [ + + ], + 'openssl_defines_VC-WIN64A': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_VC-WIN64A': [ + '-Wa,--noexecstack', + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN64A': [ + 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN64A)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64A)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN64A)'], + }, +} diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi index e4bf90727ce62e..afdc73135f5922 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN64A': [ './config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm', @@ -990,13 +957,7 @@ './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64A/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-avx2.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-avx512.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-gf2m.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm', - './config/archs/VC-WIN64A/asm_avx2/crypto/md5/md5-x86_64.asm', + './config/archs/VC-WIN64A/asm_avx2/providers/legacy.ld', './config/archs/VC-WIN64A/asm_avx2/providers/fips.ld', ], 'openssl_defines_VC-WIN64A': [ diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index 14a0cb95de6046..00a9e073959889 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -221,7 +221,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x558996f301e8)", + "RANLIB" => "CODE(0x561151d828a0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -9691,10 +9691,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27116,8 +27116,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27144,7 +27144,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27161,8 +27161,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index 05d06db5ed9714..27fe707fc580f0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Wed Sep 8 06:13:57 2021 UTC" +#define DATE "built on: Sat Oct 16 04:20:27 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi index 5538a4795a34b5..aa6d9dbd8a2d62 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/VC-WIN64A/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64A/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64A/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/VC-WIN64A/no-asm/providers/legacy.ld', './config/archs/VC-WIN64A/no-asm/providers/fips.ld', ], @@ -302,7 +303,7 @@ 'openssl_ex_libs_VC-WIN64A': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..47c820b4439ac2 --- /dev/null +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_VC-WIN64A': [ + + ], + 'openssl_defines_VC-WIN64A': [ + 'NDEBUG', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_SYS_WIN32', + 'WIN32_LEAN_AND_MEAN', + 'UNICODE', + '_UNICODE', + '_CRT_SECURE_NO_DEPRECATE', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + ], + 'openssl_cflags_VC-WIN64A': [ + '/W3 /wd4090 /nologo /O2', + '/Gs0 /GF /Gy', + '/W3 /wd4090 /nologo /O2', + ], + 'openssl_ex_libs_VC-WIN64A': [ + 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_VC-WIN64A)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_VC-WIN64A)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_VC-WIN64A)'], + }, +} diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi index 5c0650a10882ef..e63f6411abceb0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_VC-WIN64A': [ './config/archs/VC-WIN64A/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/VC-WIN64A/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/VC-WIN64A/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/VC-WIN64A/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/VC-WIN64A/no-asm/providers/legacy.ld', './config/archs/VC-WIN64A/no-asm/providers/fips.ld', ], 'openssl_defines_VC-WIN64A': [ diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index 5bfa09580b19f0..51091b7c9fe9f0 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27218,8 +27218,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27246,7 +27246,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27263,8 +27263,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h index 4e44103a72a707..405203d78c5df1 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Wed Sep 8 06:01:43 2021 UTC" +#define DATE "built on: Sat Oct 16 04:05:08 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/aix-gcc/asm/openssl-fips.gypi index 195d48d7e127e3..19abc6c32dc94d 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix-gcc/asm/openssl-fips.gypi @@ -295,8 +295,7 @@ './config/archs/aix-gcc/asm/providers/common/der/der_ecx_gen.c', './config/archs/aix-gcc/asm/providers/common/der/der_rsa_gen.c', './config/archs/aix-gcc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s', - './config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s', + './config/archs/aix-gcc/asm/providers/legacy.ld', './config/archs/aix-gcc/asm/providers/fips.ld', ], @@ -322,7 +321,7 @@ 'openssl_ex_libs_aix-gcc': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -334,7 +333,7 @@ 'defines': ['<@(openssl_defines_aix-gcc)'], 'cflags': ['<@(openssl_cflags_aix-gcc)'], 'libraries': ['<@(openssl_ex_libs_aix-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/aix-gcc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/aix-gcc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..e7c3662c4a6e38 --- /dev/null +++ b/deps/openssl/config/archs/aix-gcc/asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_aix-gcc': [ + + ], + 'openssl_defines_aix-gcc': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_aix-gcc': [ + '-O', + '-pthread', + '-O', + ], + 'openssl_ex_libs_aix-gcc': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_aix-gcc)'], + 'cflags': ['<@(openssl_cflags_aix-gcc)'], + 'libraries': ['<@(openssl_ex_libs_aix-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_aix-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi b/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi index 4b739b472dd8ec..408e3e80478b88 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/aix-gcc/asm/openssl.gypi @@ -925,37 +925,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_aix-gcc': [ './config/archs/aix-gcc/asm/crypto/aes/aes-ppc.s', @@ -980,8 +949,7 @@ './config/archs/aix-gcc/asm/providers/common/der/der_ecx_gen.c', './config/archs/aix-gcc/asm/providers/common/der/der_rsa_gen.c', './config/archs/aix-gcc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/aix-gcc/asm/crypto/bn/bn-ppc.s', - './config/archs/aix-gcc/asm/crypto/bn/ppc-mont.s', + './config/archs/aix-gcc/asm/providers/legacy.ld', './config/archs/aix-gcc/asm/providers/fips.ld', ], 'openssl_defines_aix-gcc': [ diff --git a/deps/openssl/config/archs/aix-gcc/asm/providers/legacy.ld b/deps/openssl/config/archs/aix-gcc/asm/providers/legacy.ld new file mode 100644 index 00000000000000..8d6632bf3866af --- /dev/null +++ b/deps/openssl/config/archs/aix-gcc/asm/providers/legacy.ld @@ -0,0 +1 @@ +OSSL_provider_init diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm index 4dd9297c6cc1e4..bd0bf38adc963c 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27218,8 +27218,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27246,7 +27246,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27263,8 +27263,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h index bdef0b3929c66d..7444d08e2e7908 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Wed Sep 8 06:01:54 2021 UTC" +#define DATE "built on: Sat Oct 16 04:05:23 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-fips.gypi index 645f7ae11af4c4..48d691f822b5fd 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-fips.gypi @@ -295,8 +295,7 @@ './config/archs/aix-gcc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/aix-gcc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/aix-gcc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/aix-gcc/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/aix-gcc/asm_avx2/crypto/bn/ppc-mont.s', + './config/archs/aix-gcc/asm_avx2/providers/legacy.ld', './config/archs/aix-gcc/asm_avx2/providers/fips.ld', ], @@ -322,7 +321,7 @@ 'openssl_ex_libs_aix-gcc': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -334,7 +333,7 @@ 'defines': ['<@(openssl_defines_aix-gcc)'], 'cflags': ['<@(openssl_cflags_aix-gcc)'], 'libraries': ['<@(openssl_ex_libs_aix-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..e7c3662c4a6e38 --- /dev/null +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_aix-gcc': [ + + ], + 'openssl_defines_aix-gcc': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_aix-gcc': [ + '-O', + '-pthread', + '-O', + ], + 'openssl_ex_libs_aix-gcc': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_aix-gcc)'], + 'cflags': ['<@(openssl_cflags_aix-gcc)'], + 'libraries': ['<@(openssl_ex_libs_aix-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_aix-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl.gypi index 987fa7f6182563..bfa1556c9e248f 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/openssl.gypi @@ -925,37 +925,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_aix-gcc': [ './config/archs/aix-gcc/asm_avx2/crypto/aes/aes-ppc.s', @@ -980,8 +949,7 @@ './config/archs/aix-gcc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/aix-gcc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/aix-gcc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/aix-gcc/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/aix-gcc/asm_avx2/crypto/bn/ppc-mont.s', + './config/archs/aix-gcc/asm_avx2/providers/legacy.ld', './config/archs/aix-gcc/asm_avx2/providers/fips.ld', ], 'openssl_defines_aix-gcc': [ diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/aix-gcc/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..8d6632bf3866af --- /dev/null +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/providers/legacy.ld @@ -0,0 +1 @@ +OSSL_provider_init diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index a5becee17de6a8..7e1ff2b354ef16 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -208,7 +208,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9633,10 +9633,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27033,8 +27033,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27061,7 +27061,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27078,8 +27078,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h index 648f507f97111d..a1303ec2ba86f0 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Wed Sep 8 06:02:05 2021 UTC" +#define DATE "built on: Sat Oct 16 04:05:37 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/aix-gcc/no-asm/openssl-fips.gypi index efc7e719e76745..6bf77c8d9c1f95 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix-gcc/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/aix-gcc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/aix-gcc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/aix-gcc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/aix-gcc/no-asm/providers/legacy.ld', './config/archs/aix-gcc/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_aix-gcc': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_aix-gcc)'], 'cflags': ['<@(openssl_cflags_aix-gcc)'], 'libraries': ['<@(openssl_ex_libs_aix-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/aix-gcc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..226c64e3a44357 --- /dev/null +++ b/deps/openssl/config/archs/aix-gcc/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_aix-gcc': [ + + ], + 'openssl_defines_aix-gcc': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_aix-gcc': [ + '-O', + '-pthread', + '-O', + ], + 'openssl_ex_libs_aix-gcc': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_aix-gcc)'], + 'cflags': ['<@(openssl_cflags_aix-gcc)'], + 'libraries': ['<@(openssl_ex_libs_aix-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_aix-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi index 3e55787eb76f8e..3d32f6864e6067 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/aix-gcc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_aix-gcc': [ './config/archs/aix-gcc/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/aix-gcc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/aix-gcc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/aix-gcc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/aix-gcc/no-asm/providers/legacy.ld', './config/archs/aix-gcc/no-asm/providers/fips.ld', ], 'openssl_defines_aix-gcc': [ diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/providers/legacy.ld b/deps/openssl/config/archs/aix-gcc/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..8d6632bf3866af --- /dev/null +++ b/deps/openssl/config/archs/aix-gcc/no-asm/providers/legacy.ld @@ -0,0 +1 @@ +OSSL_provider_init diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm index da3a77307a6e35..64c6f2e3a9bd60 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7975,6 +7975,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7992,10 +7995,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -27281,8 +27281,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27309,7 +27309,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27326,8 +27326,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h index e430728ac89d47..c22973a8fdd872 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Wed Sep 8 06:02:15 2021 UTC" +#define DATE "built on: Sat Oct 16 04:05:50 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi index 03400f5feea9a6..11c9bd211794db 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-fips.gypi @@ -300,9 +300,7 @@ './config/archs/aix64-gcc-as/asm/providers/common/der/der_ecx_gen.c', './config/archs/aix64-gcc-as/asm/providers/common/der/der_rsa_gen.c', './config/archs/aix64-gcc-as/asm/providers/common/der/der_wrap_gen.c', - './config/archs/aix64-gcc-as/asm/crypto/bn/bn-ppc.s', - './config/archs/aix64-gcc-as/asm/crypto/bn/ppc-mont.s', - './config/archs/aix64-gcc-as/asm/crypto/bn/ppc64-mont-fixed.s', + './config/archs/aix64-gcc-as/asm/providers/legacy.ld', './config/archs/aix64-gcc-as/asm/providers/fips.ld', ], @@ -331,7 +329,7 @@ 'openssl_ex_libs_aix64-gcc-as': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -343,7 +341,7 @@ 'defines': ['<@(openssl_defines_aix64-gcc-as)'], 'cflags': ['<@(openssl_cflags_aix64-gcc-as)'], 'libraries': ['<@(openssl_ex_libs_aix64-gcc-as)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-legacy.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..000b7df51ff205 --- /dev/null +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_aix64-gcc-as': [ + + ], + 'openssl_defines_aix64-gcc-as': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_aix64-gcc-as': [ + '-O', + '-maix64 -pthread', + '-O', + ], + 'openssl_ex_libs_aix64-gcc-as': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + 'cflags': ['<@(openssl_cflags_aix64-gcc-as)'], + 'libraries': ['<@(openssl_ex_libs_aix64-gcc-as)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + }, +} diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi index 82591990022ecc..a69d2915e53f11 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/openssl.gypi @@ -926,37 +926,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_aix64-gcc-as': [ './config/archs/aix64-gcc-as/asm/crypto/aes/aes-ppc.s', @@ -985,9 +954,7 @@ './config/archs/aix64-gcc-as/asm/providers/common/der/der_ecx_gen.c', './config/archs/aix64-gcc-as/asm/providers/common/der/der_rsa_gen.c', './config/archs/aix64-gcc-as/asm/providers/common/der/der_wrap_gen.c', - './config/archs/aix64-gcc-as/asm/crypto/bn/bn-ppc.s', - './config/archs/aix64-gcc-as/asm/crypto/bn/ppc-mont.s', - './config/archs/aix64-gcc-as/asm/crypto/bn/ppc64-mont-fixed.s', + './config/archs/aix64-gcc-as/asm/providers/legacy.ld', './config/archs/aix64-gcc-as/asm/providers/fips.ld', ], 'openssl_defines_aix64-gcc-as': [ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm/providers/legacy.ld b/deps/openssl/config/archs/aix64-gcc-as/asm/providers/legacy.ld new file mode 100644 index 00000000000000..8d6632bf3866af --- /dev/null +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/providers/legacy.ld @@ -0,0 +1 @@ +OSSL_provider_init diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm index 9ac1fc548a5982..ed9ea9f6ca084e 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27281,8 +27281,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27309,7 +27309,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27326,8 +27326,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h index 2aec3c98aabc1b..7cab83124751fa 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Wed Sep 8 06:02:26 2021 UTC" +#define DATE "built on: Sat Oct 16 04:06:05 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi index 1cfbdd29e3b90b..7f1f0289912d5d 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-fips.gypi @@ -300,9 +300,7 @@ './config/archs/aix64-gcc-as/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/aix64-gcc-as/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/aix64-gcc-as/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/aix64-gcc-as/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/aix64-gcc-as/asm_avx2/crypto/bn/ppc-mont.s', - './config/archs/aix64-gcc-as/asm_avx2/crypto/bn/ppc64-mont-fixed.s', + './config/archs/aix64-gcc-as/asm_avx2/providers/legacy.ld', './config/archs/aix64-gcc-as/asm_avx2/providers/fips.ld', ], @@ -331,7 +329,7 @@ 'openssl_ex_libs_aix64-gcc-as': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -343,7 +341,7 @@ 'defines': ['<@(openssl_defines_aix64-gcc-as)'], 'cflags': ['<@(openssl_cflags_aix64-gcc-as)'], 'libraries': ['<@(openssl_ex_libs_aix64-gcc-as)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..000b7df51ff205 --- /dev/null +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_aix64-gcc-as': [ + + ], + 'openssl_defines_aix64-gcc-as': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_aix64-gcc-as': [ + '-O', + '-maix64 -pthread', + '-O', + ], + 'openssl_ex_libs_aix64-gcc-as': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + 'cflags': ['<@(openssl_cflags_aix64-gcc-as)'], + 'libraries': ['<@(openssl_ex_libs_aix64-gcc-as)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + }, +} diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi index 49598f7ec066f5..4a7a6a634ae61f 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/openssl.gypi @@ -926,37 +926,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_aix64-gcc-as': [ './config/archs/aix64-gcc-as/asm_avx2/crypto/aes/aes-ppc.s', @@ -985,9 +954,7 @@ './config/archs/aix64-gcc-as/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/aix64-gcc-as/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/aix64-gcc-as/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/aix64-gcc-as/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/aix64-gcc-as/asm_avx2/crypto/bn/ppc-mont.s', - './config/archs/aix64-gcc-as/asm_avx2/crypto/bn/ppc64-mont-fixed.s', + './config/archs/aix64-gcc-as/asm_avx2/providers/legacy.ld', './config/archs/aix64-gcc-as/asm_avx2/providers/fips.ld', ], 'openssl_defines_aix64-gcc-as': [ diff --git a/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..8d6632bf3866af --- /dev/null +++ b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/providers/legacy.ld @@ -0,0 +1 @@ +OSSL_provider_init diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm index 6ec80b39158355..cc5bc1e3061aa9 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm @@ -208,7 +208,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7941,6 +7941,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7958,10 +7961,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -27035,8 +27035,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27063,7 +27063,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27080,8 +27080,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h index 9a099e8c7170b4..30d4f39093edc7 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc-as" -#define DATE "built on: Wed Sep 8 06:02:37 2021 UTC" +#define DATE "built on: Sat Oct 16 04:06:19 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi index d623bd0dbda17f..35cefcb3a00f3b 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/aix64-gcc-as/no-asm/providers/legacy.ld', './config/archs/aix64-gcc-as/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_aix64-gcc-as': [ '-pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_aix64-gcc-as)'], 'cflags': ['<@(openssl_cflags_aix64-gcc-as)'], 'libraries': ['<@(openssl_ex_libs_aix64-gcc-as)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..678949f2343a32 --- /dev/null +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_aix64-gcc-as': [ + + ], + 'openssl_defines_aix64-gcc-as': [ + 'NDEBUG', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_aix64-gcc-as': [ + '-O', + '-maix64 -pthread', + '-O', + ], + 'openssl_ex_libs_aix64-gcc-as': [ + '-pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + 'cflags': ['<@(openssl_cflags_aix64-gcc-as)'], + 'libraries': ['<@(openssl_ex_libs_aix64-gcc-as)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_aix64-gcc-as)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_aix64-gcc-as)'], + }, +} diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi index 91df60cc750dff..726deeecbf4bb9 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_aix64-gcc-as': [ './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/aix64-gcc-as/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/aix64-gcc-as/no-asm/providers/legacy.ld', './config/archs/aix64-gcc-as/no-asm/providers/fips.ld', ], 'openssl_defines_aix64-gcc-as': [ diff --git a/deps/openssl/config/archs/aix64-gcc-as/no-asm/providers/legacy.ld b/deps/openssl/config/archs/aix64-gcc-as/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..8d6632bf3866af --- /dev/null +++ b/deps/openssl/config/archs/aix64-gcc-as/no-asm/providers/legacy.ld @@ -0,0 +1 @@ +OSSL_provider_init diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index a5e033af8cb1e2..095ea57ea99e2a 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9706,10 +9706,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27179,8 +27179,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27207,7 +27207,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27224,8 +27224,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index 175babcd332bc9..9a5feb7099fe5a 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Wed Sep 8 06:04:43 2021 UTC" +#define DATE "built on: Sat Oct 16 04:08:56 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi index b7da8e2250600b..38dab54f7ae8e0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-fips.gypi @@ -298,13 +298,6 @@ './config/archs/darwin-i386-cc/asm/providers/common/der/der_ecx_gen.c', './config/archs/darwin-i386-cc/asm/providers/common/der/der_rsa_gen.c', './config/archs/darwin-i386-cc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s', - './config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s', - './config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.s', - './config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s', - './config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s', - './config/archs/darwin-i386-cc/asm/crypto/des/des-586.s', - './config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s', ], 'openssl_defines_darwin-i386-cc': [ @@ -336,7 +329,7 @@ 'openssl_ex_libs_darwin-i386-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -348,7 +341,7 @@ 'defines': ['<@(openssl_defines_darwin-i386-cc)'], 'cflags': ['<@(openssl_cflags_darwin-i386-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin-i386-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..3a9c20848b41dc --- /dev/null +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-legacy.gypi @@ -0,0 +1,76 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin-i386-cc': [ + + ], + 'openssl_defines_darwin-i386-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_darwin-i386-cc': [ + '-Wa,--noexecstack', + '-O3 -fomit-frame-pointer', + '-arch i386', + '-O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_darwin-i386-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + 'cflags': ['<@(openssl_cflags_darwin-i386-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin-i386-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 9a6d136ab3d14a..0f22ee0473a26d 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin-i386-cc': [ './config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s', @@ -972,13 +944,6 @@ './config/archs/darwin-i386-cc/asm/providers/common/der/der_ecx_gen.c', './config/archs/darwin-i386-cc/asm/providers/common/der/der_rsa_gen.c', './config/archs/darwin-i386-cc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/darwin-i386-cc/asm/crypto/bn/bn-586.s', - './config/archs/darwin-i386-cc/asm/crypto/bn/co-586.s', - './config/archs/darwin-i386-cc/asm/crypto/bn/x86-gf2m.s', - './config/archs/darwin-i386-cc/asm/crypto/bn/x86-mont.s', - './config/archs/darwin-i386-cc/asm/crypto/des/crypt586.s', - './config/archs/darwin-i386-cc/asm/crypto/des/des-586.s', - './config/archs/darwin-i386-cc/asm/crypto/md5/md5-586.s', ], 'openssl_defines_darwin-i386-cc': [ 'NDEBUG', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm index 3d467a02cfb10f..b59094f816058e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7987,9 +7987,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8007,7 +8004,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27179,8 +27179,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27207,7 +27207,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27224,8 +27224,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h index abdecfe09c67b2..fd0d4f308484e4 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Wed Sep 8 06:04:55 2021 UTC" +#define DATE "built on: Sat Oct 16 04:09:11 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi index d857d8edc983a0..97c1112bcc6b54 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-fips.gypi @@ -298,13 +298,6 @@ './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.s', ], 'openssl_defines_darwin-i386-cc': [ @@ -336,7 +329,7 @@ 'openssl_ex_libs_darwin-i386-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -348,7 +341,7 @@ 'defines': ['<@(openssl_defines_darwin-i386-cc)'], 'cflags': ['<@(openssl_cflags_darwin-i386-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin-i386-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..3a9c20848b41dc --- /dev/null +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,76 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin-i386-cc': [ + + ], + 'openssl_defines_darwin-i386-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_darwin-i386-cc': [ + '-Wa,--noexecstack', + '-O3 -fomit-frame-pointer', + '-arch i386', + '-O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_darwin-i386-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + 'cflags': ['<@(openssl_cflags_darwin-i386-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin-i386-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi index a661dfddce42ce..d31b103dc36517 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin-i386-cc': [ './config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s', @@ -972,13 +944,6 @@ './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/darwin-i386-cc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/bn-586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/co-586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/des/crypt586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/des/des-586.s', - './config/archs/darwin-i386-cc/asm_avx2/crypto/md5/md5-586.s', ], 'openssl_defines_darwin-i386-cc': [ 'NDEBUG', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index fc81f39f1c8075..3c6e85f4d45008 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm @@ -208,7 +208,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9624,10 +9624,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -26996,8 +26996,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27024,7 +27024,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27041,8 +27041,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index e8f966a009ffe1..c6374b6dcff8ba 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Wed Sep 8 06:05:07 2021 UTC" +#define DATE "built on: Sat Oct 16 04:09:25 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi index 966591e84dd9b4..6ec4f46eb0fa0f 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-fips.gypi @@ -296,7 +296,7 @@ 'openssl_ex_libs_darwin-i386-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -308,7 +308,7 @@ 'defines': ['<@(openssl_defines_darwin-i386-cc)'], 'cflags': ['<@(openssl_cflags_darwin-i386-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin-i386-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..1f36046bb03481 --- /dev/null +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin-i386-cc': [ + + ], + 'openssl_defines_darwin-i386-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_darwin-i386-cc': [ + '-O3 -fomit-frame-pointer', + '-arch i386', + '-O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_darwin-i386-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + 'cflags': ['<@(openssl_cflags_darwin-i386-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin-i386-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin-i386-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin-i386-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi index f8a3ae1d7e0a1d..d2ef2b9e68102e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin-i386-cc': [ './config/archs/darwin-i386-cc/no-asm/providers/common/der/der_sm2_gen.c', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm index f0039ad2db499a..b5963bc0e7114d 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27205,8 +27205,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27233,7 +27233,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27250,8 +27250,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h index 6f6999976c197d..a3dd2d010048da 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Wed Sep 8 06:05:17 2021 UTC" +#define DATE "built on: Sat Oct 16 04:09:38 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi index fc73cb71c24416..a67ee864649c6a 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-fips.gypi @@ -292,7 +292,6 @@ './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-arm64-cc/asm/crypto/bn/armv8-mont.S', ], 'openssl_defines_darwin64-arm64-cc': [ @@ -319,7 +318,7 @@ 'openssl_ex_libs_darwin64-arm64-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -331,7 +330,7 @@ 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], 'cflags': ['<@(openssl_cflags_darwin64-arm64-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin64-arm64-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..ab684342ce27da --- /dev/null +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl-legacy.gypi @@ -0,0 +1,74 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin64-arm64-cc': [ + + ], + 'openssl_defines_darwin64-arm64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_darwin64-arm64-cc': [ + '-Wa,--noexecstack', + '-O3 -Wall', + '-arch arm64', + '-O3 -Wall', + ], + 'openssl_ex_libs_darwin64-arm64-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + 'cflags': ['<@(openssl_cflags_darwin64-arm64-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin64-arm64-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi index a7a14bd721f23a..462dfb8a26e564 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/openssl.gypi @@ -922,37 +922,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin64-arm64-cc': [ './config/archs/darwin64-arm64-cc/asm/crypto/aes/aesv8-armx.S', @@ -975,7 +944,6 @@ './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-arm64-cc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-arm64-cc/asm/crypto/bn/armv8-mont.S', ], 'openssl_defines_darwin64-arm64-cc': [ 'NDEBUG', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm index 034ac9c5647bb4..1c856a7cbaf4b2 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7960,9 +7960,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7980,7 +7977,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27205,8 +27205,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27233,7 +27233,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27250,8 +27250,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h index 8d7fe819925d8e..51f8fdce0bb3bb 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Wed Sep 8 06:05:28 2021 UTC" +#define DATE "built on: Sat Oct 16 04:09:53 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi index 0cc4fccaa967d1..6de0911f7dce58 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-fips.gypi @@ -292,7 +292,6 @@ './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-arm64-cc/asm_avx2/crypto/bn/armv8-mont.S', ], 'openssl_defines_darwin64-arm64-cc': [ @@ -319,7 +318,7 @@ 'openssl_ex_libs_darwin64-arm64-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -331,7 +330,7 @@ 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], 'cflags': ['<@(openssl_cflags_darwin64-arm64-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin64-arm64-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..ab684342ce27da --- /dev/null +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,74 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin64-arm64-cc': [ + + ], + 'openssl_defines_darwin64-arm64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_darwin64-arm64-cc': [ + '-Wa,--noexecstack', + '-O3 -Wall', + '-arch arm64', + '-O3 -Wall', + ], + 'openssl_ex_libs_darwin64-arm64-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + 'cflags': ['<@(openssl_cflags_darwin64-arm64-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin64-arm64-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi index a8e6c841a2ba8b..e7643c3b087df3 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/openssl.gypi @@ -922,37 +922,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin64-arm64-cc': [ './config/archs/darwin64-arm64-cc/asm_avx2/crypto/aes/aesv8-armx.S', @@ -975,7 +944,6 @@ './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-arm64-cc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-arm64-cc/asm_avx2/crypto/bn/armv8-mont.S', ], 'openssl_defines_darwin64-arm64-cc': [ 'NDEBUG', diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm index 0cf5d1605eb1d0..792ae19603d0fa 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/configdata.pm @@ -208,7 +208,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -26996,8 +26996,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27024,7 +27024,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27041,8 +27041,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h index 94601e626ad9f6..2200103c844e06 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-arm64-cc" -#define DATE "built on: Wed Sep 8 06:05:40 2021 UTC" +#define DATE "built on: Sat Oct 16 04:10:07 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi index 7ace6da3363fe5..30256c334cc694 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-fips.gypi @@ -296,7 +296,7 @@ 'openssl_ex_libs_darwin64-arm64-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -308,7 +308,7 @@ 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], 'cflags': ['<@(openssl_cflags_darwin64-arm64-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin64-arm64-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..cb12df3116e662 --- /dev/null +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin64-arm64-cc': [ + + ], + 'openssl_defines_darwin64-arm64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_darwin64-arm64-cc': [ + '-O3 -Wall', + '-arch arm64', + '-O3 -Wall', + ], + 'openssl_ex_libs_darwin64-arm64-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + 'cflags': ['<@(openssl_cflags_darwin64-arm64-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin64-arm64-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-arm64-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin64-arm64-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi index 233a46169eba02..ad6948a9ec74bd 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin64-arm64-cc': [ './config/archs/darwin64-arm64-cc/no-asm/providers/common/der/der_sm2_gen.c', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index d3256f638eef28..da97f2352ecaaa 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27348,8 +27348,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27376,7 +27376,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27393,8 +27393,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index 24a9826a8acb48..fce358745cb28f 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Wed Sep 8 06:04:02 2021 UTC" +#define DATE "built on: Sat Oct 16 04:08:07 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi index c055c14771dc1e..3d789d59508c83 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-fips.gypi @@ -310,13 +310,6 @@ './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx512.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s', ], 'openssl_defines_darwin64-x86_64-cc': [ @@ -350,7 +343,7 @@ 'openssl_ex_libs_darwin64-x86_64-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -362,7 +355,7 @@ 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], 'cflags': ['<@(openssl_cflags_darwin64-x86_64-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin64-x86_64-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..53770e12a8f112 --- /dev/null +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-legacy.gypi @@ -0,0 +1,80 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin64-x86_64-cc': [ + + ], + 'openssl_defines_darwin64-x86_64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_darwin64-x86_64-cc': [ + '-Wa,--noexecstack', + '-O3 -Wall', + '-arch x86_64', + '-O3 -Wall', + ], + 'openssl_ex_libs_darwin64-x86_64-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + 'cflags': ['<@(openssl_cflags_darwin64-x86_64-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin64-x86_64-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index e6b026dd2961e6..d23969e36fc4f8 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin64-x86_64-cc': [ './config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s', @@ -990,13 +957,6 @@ './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-x86_64-cc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx2.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-avx512.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s', - './config/archs/darwin64-x86_64-cc/asm/crypto/md5/md5-x86_64.s', ], 'openssl_defines_darwin64-x86_64-cc': [ 'NDEBUG', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm index 51687cd499b80c..88c9506f1f4031 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7990,9 +7990,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8010,7 +8007,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9751,10 +9751,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27348,8 +27348,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27376,7 +27376,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27393,8 +27393,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h index 033ab9a0156c2e..3956b72daa36c7 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Wed Sep 8 06:04:18 2021 UTC" +#define DATE "built on: Sat Oct 16 04:08:25 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi index 09d4e73f375a1b..ad78a5022837cf 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-fips.gypi @@ -310,13 +310,6 @@ './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/md5/md5-x86_64.s', ], 'openssl_defines_darwin64-x86_64-cc': [ @@ -350,7 +343,7 @@ 'openssl_ex_libs_darwin64-x86_64-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -362,7 +355,7 @@ 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], 'cflags': ['<@(openssl_cflags_darwin64-x86_64-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin64-x86_64-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..53770e12a8f112 --- /dev/null +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,80 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin64-x86_64-cc': [ + + ], + 'openssl_defines_darwin64-x86_64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_darwin64-x86_64-cc': [ + '-Wa,--noexecstack', + '-O3 -Wall', + '-arch x86_64', + '-O3 -Wall', + ], + 'openssl_ex_libs_darwin64-x86_64-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + 'cflags': ['<@(openssl_cflags_darwin64-x86_64-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin64-x86_64-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi index cae05606aa8746..bc921fd152a58e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin64-x86_64-cc': [ './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s', @@ -990,13 +957,6 @@ './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/darwin64-x86_64-cc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/darwin64-x86_64-cc/asm_avx2/crypto/md5/md5-x86_64.s', ], 'openssl_defines_darwin64-x86_64-cc': [ 'NDEBUG', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index d996e55a387d5a..6828bb923ecf48 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm @@ -208,7 +208,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7931,9 +7931,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7951,7 +7948,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -26996,8 +26996,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27024,7 +27024,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27041,8 +27041,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index 370da121c1b5ca..7dae539b66d617 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Wed Sep 8 06:04:33 2021 UTC" +#define DATE "built on: Sat Oct 16 04:08:43 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi index 174dd858d5afe6..e780412a1843f5 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-fips.gypi @@ -296,7 +296,7 @@ 'openssl_ex_libs_darwin64-x86_64-cc': [ '', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -308,7 +308,7 @@ 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], 'cflags': ['<@(openssl_cflags_darwin64-x86_64-cc)'], 'libraries': ['<@(openssl_ex_libs_darwin64-x86_64-cc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..9b8c146fb659e0 --- /dev/null +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_darwin64-x86_64-cc': [ + + ], + 'openssl_defines_darwin64-x86_64-cc': [ + 'NDEBUG', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_darwin64-x86_64-cc': [ + '-O3 -Wall', + '-arch x86_64', + '-O3 -Wall', + ], + 'openssl_ex_libs_darwin64-x86_64-cc': [ + '', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + 'cflags': ['<@(openssl_cflags_darwin64-x86_64-cc)'], + 'libraries': ['<@(openssl_ex_libs_darwin64-x86_64-cc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_darwin64-x86_64-cc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_darwin64-x86_64-cc)'], + }, +} diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi index aaf263c1042022..1a29f6174a5f7e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_darwin64-x86_64-cc': [ './config/archs/darwin64-x86_64-cc/no-asm/providers/common/der/der_sm2_gen.c', diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index f408676bed7321..9a7d543cbba6b9 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27249,8 +27249,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27277,7 +27277,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27294,8 +27294,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index af15bcb7d6f82f..b5c6ea05c2e818 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Wed Sep 8 06:05:50 2021 UTC" +#define DATE "built on: Sat Oct 16 04:10:20 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi index 7f435bdd4c7193..60acc741cb0c89 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi @@ -292,7 +292,7 @@ './config/archs/linux-aarch64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-aarch64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-aarch64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-aarch64/asm/crypto/bn/armv8-mont.S', + './config/archs/linux-aarch64/asm/providers/legacy.ld', './config/archs/linux-aarch64/asm/providers/fips.ld', ], @@ -320,7 +320,7 @@ 'openssl_ex_libs_linux-aarch64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-aarch64/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -332,7 +332,7 @@ 'defines': ['<@(openssl_defines_linux-aarch64)'], 'cflags': ['<@(openssl_cflags_linux-aarch64)'], 'libraries': ['<@(openssl_ex_libs_linux-aarch64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..3cdab57c257466 --- /dev/null +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl-legacy.gypi @@ -0,0 +1,74 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-aarch64': [ + + ], + 'openssl_defines_linux-aarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-aarch64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-aarch64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-aarch64)'], + 'cflags': ['<@(openssl_cflags_linux-aarch64)'], + 'libraries': ['<@(openssl_ex_libs_linux-aarch64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-aarch64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi index 8eded6043d33e7..958a567e2ee47e 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl.gypi @@ -922,37 +922,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-aarch64': [ './config/archs/linux-aarch64/asm/crypto/aes/aesv8-armx.S', @@ -975,7 +944,7 @@ './config/archs/linux-aarch64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-aarch64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-aarch64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-aarch64/asm/crypto/bn/armv8-mont.S', + './config/archs/linux-aarch64/asm/providers/legacy.ld', './config/archs/linux-aarch64/asm/providers/fips.ld', ], 'openssl_defines_linux-aarch64': [ diff --git a/deps/openssl/config/archs/linux-aarch64/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-aarch64/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-aarch64/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm index e02a22b0411c53..31ab714451e96f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7975,6 +7975,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7992,10 +7995,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9693,10 +9693,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27249,8 +27249,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27277,7 +27277,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27294,8 +27294,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h index 3a1ad8b22cc410..c5f7250d93a5f0 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Wed Sep 8 06:06:02 2021 UTC" +#define DATE "built on: Sat Oct 16 04:10:34 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi index 20dde97d8aa1b7..a9316e08f87d75 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-fips.gypi @@ -292,7 +292,7 @@ './config/archs/linux-aarch64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-aarch64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-aarch64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-aarch64/asm_avx2/crypto/bn/armv8-mont.S', + './config/archs/linux-aarch64/asm_avx2/providers/legacy.ld', './config/archs/linux-aarch64/asm_avx2/providers/fips.ld', ], @@ -320,7 +320,7 @@ 'openssl_ex_libs_linux-aarch64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-aarch64/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -332,7 +332,7 @@ 'defines': ['<@(openssl_defines_linux-aarch64)'], 'cflags': ['<@(openssl_cflags_linux-aarch64)'], 'libraries': ['<@(openssl_ex_libs_linux-aarch64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..94c382c9b5cdea --- /dev/null +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,74 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-aarch64': [ + + ], + 'openssl_defines_linux-aarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-aarch64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-aarch64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-aarch64)'], + 'cflags': ['<@(openssl_cflags_linux-aarch64)'], + 'libraries': ['<@(openssl_ex_libs_linux-aarch64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-aarch64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi index d393701656ef2b..69eb739c037e8a 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/openssl.gypi @@ -922,37 +922,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-aarch64': [ './config/archs/linux-aarch64/asm_avx2/crypto/aes/aesv8-armx.S', @@ -975,7 +944,7 @@ './config/archs/linux-aarch64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-aarch64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-aarch64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-aarch64/asm_avx2/crypto/bn/armv8-mont.S', + './config/archs/linux-aarch64/asm_avx2/providers/legacy.ld', './config/archs/linux-aarch64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-aarch64': [ diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index 0d9c77627cf56a..ba63893a81d1ae 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9640,10 +9640,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27040,8 +27040,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27068,7 +27068,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27085,8 +27085,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index 2cb431cc71c59d..9bd5a82ddbc3f9 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Wed Sep 8 06:06:13 2021 UTC" +#define DATE "built on: Sat Oct 16 04:10:49 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi index 612a00a4ca53fa..8ffd9d5dffbf3a 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-aarch64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-aarch64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-aarch64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-aarch64/no-asm/providers/legacy.ld', './config/archs/linux-aarch64/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_linux-aarch64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-aarch64/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_linux-aarch64)'], 'cflags': ['<@(openssl_cflags_linux-aarch64)'], 'libraries': ['<@(openssl_ex_libs_linux-aarch64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..419213703f16dd --- /dev/null +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-aarch64': [ + + ], + 'openssl_defines_linux-aarch64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-aarch64': [ + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-aarch64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-aarch64)'], + 'cflags': ['<@(openssl_cflags_linux-aarch64)'], + 'libraries': ['<@(openssl_ex_libs_linux-aarch64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-aarch64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-aarch64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi index 38504c93749827..2bdfcf54ec598e 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-aarch64': [ './config/archs/linux-aarch64/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-aarch64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-aarch64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-aarch64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-aarch64/no-asm/providers/legacy.ld', './config/archs/linux-aarch64/no-asm/providers/fips.ld', ], 'openssl_defines_linux-aarch64': [ diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-aarch64/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index 69a4358e58ecdd..4476f156699269 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9705,10 +9705,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27300,8 +27300,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27328,7 +27328,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27345,8 +27345,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index 411e72be8aba41..a95e87722b721c 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Wed Sep 8 06:06:23 2021 UTC" +#define DATE "built on: Sat Oct 16 04:11:02 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi index 38bb49c8ceec57..a212ed0b3815ee 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi @@ -293,8 +293,7 @@ './config/archs/linux-armv4/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-armv4/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-armv4/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-armv4/asm/crypto/bn/armv4-gf2m.S', - './config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S', + './config/archs/linux-armv4/asm/providers/legacy.ld', './config/archs/linux-armv4/asm/providers/fips.ld', ], @@ -325,7 +324,7 @@ 'openssl_ex_libs_linux-armv4': [ '-ldl -pthread -latomic', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-armv4/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -337,7 +336,7 @@ 'defines': ['<@(openssl_defines_linux-armv4)'], 'cflags': ['<@(openssl_cflags_linux-armv4)'], 'libraries': ['<@(openssl_ex_libs_linux-armv4)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..4bf24c47f65cc0 --- /dev/null +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-armv4': [ + + ], + 'openssl_defines_linux-armv4': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-armv4': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-armv4': [ + '-ldl -pthread -latomic', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-armv4)'], + 'cflags': ['<@(openssl_cflags_linux-armv4)'], + 'libraries': ['<@(openssl_ex_libs_linux-armv4)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-armv4)'], + }, +} diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi index 47a68dab612dd6..8279b71528bf97 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi @@ -921,37 +921,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-armv4': [ './config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S', @@ -976,8 +945,7 @@ './config/archs/linux-armv4/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-armv4/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-armv4/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-armv4/asm/crypto/bn/armv4-gf2m.S', - './config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S', + './config/archs/linux-armv4/asm/providers/legacy.ld', './config/archs/linux-armv4/asm/providers/fips.ld', ], 'openssl_defines_linux-armv4': [ diff --git a/deps/openssl/config/archs/linux-armv4/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-armv4/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-armv4/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm index 997b40f8fbc1cc..262966e44f307a 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27300,8 +27300,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27328,7 +27328,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27345,8 +27345,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h index ae5fc32c287ec8..046338a9847981 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Wed Sep 8 06:06:35 2021 UTC" +#define DATE "built on: Sat Oct 16 04:11:16 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi index 44d07662cfa4b5..db051ff1a97bdc 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-fips.gypi @@ -293,8 +293,7 @@ './config/archs/linux-armv4/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-armv4/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-armv4/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-armv4/asm_avx2/crypto/bn/armv4-gf2m.S', - './config/archs/linux-armv4/asm_avx2/crypto/bn/armv4-mont.S', + './config/archs/linux-armv4/asm_avx2/providers/legacy.ld', './config/archs/linux-armv4/asm_avx2/providers/fips.ld', ], @@ -325,7 +324,7 @@ 'openssl_ex_libs_linux-armv4': [ '-ldl -pthread -latomic', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-armv4/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -337,7 +336,7 @@ 'defines': ['<@(openssl_defines_linux-armv4)'], 'cflags': ['<@(openssl_cflags_linux-armv4)'], 'libraries': ['<@(openssl_ex_libs_linux-armv4)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..20c82b99697848 --- /dev/null +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-armv4': [ + + ], + 'openssl_defines_linux-armv4': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-armv4': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-armv4': [ + '-ldl -pthread -latomic', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-armv4)'], + 'cflags': ['<@(openssl_cflags_linux-armv4)'], + 'libraries': ['<@(openssl_ex_libs_linux-armv4)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-armv4)'], + }, +} diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi index c6110696fc41f6..13f30cbf425203 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/openssl.gypi @@ -921,37 +921,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-armv4': [ './config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S', @@ -976,8 +945,7 @@ './config/archs/linux-armv4/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-armv4/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-armv4/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-armv4/asm_avx2/crypto/bn/armv4-gf2m.S', - './config/archs/linux-armv4/asm_avx2/crypto/bn/armv4-mont.S', + './config/archs/linux-armv4/asm_avx2/providers/legacy.ld', './config/archs/linux-armv4/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-armv4': [ diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-armv4/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index 198de3bc9435d8..340a25a9649f24 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9640,10 +9640,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27040,8 +27040,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27068,7 +27068,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27085,8 +27085,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index f6890afebf2059..115dd8b600ba8e 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Wed Sep 8 06:06:47 2021 UTC" +#define DATE "built on: Sat Oct 16 04:11:31 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi index bddf9ce0afc34c..e6c459ad54604f 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-armv4/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-armv4/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-armv4/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-armv4/no-asm/providers/legacy.ld', './config/archs/linux-armv4/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_linux-armv4': [ '-ldl -pthread -latomic', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-armv4/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_linux-armv4)'], 'cflags': ['<@(openssl_cflags_linux-armv4)'], 'libraries': ['<@(openssl_ex_libs_linux-armv4)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..8917cc671521c7 --- /dev/null +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-armv4': [ + + ], + 'openssl_defines_linux-armv4': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-armv4': [ + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-armv4': [ + '-ldl -pthread -latomic', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-armv4)'], + 'cflags': ['<@(openssl_cflags_linux-armv4)'], + 'libraries': ['<@(openssl_ex_libs_linux-armv4)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-armv4)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-armv4)'], + }, +} diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi index 23b57733683c95..8cb714b149d8fa 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-armv4/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-armv4': [ './config/archs/linux-armv4/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-armv4/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-armv4/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-armv4/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-armv4/no-asm/providers/legacy.ld', './config/archs/linux-armv4/no-asm/providers/fips.ld', ], 'openssl_defines_linux-armv4': [ diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-armv4/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-armv4/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index a197cde1a48aee..114a96f7f5d3fe 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -8001,6 +8001,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8018,10 +8021,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -27222,8 +27222,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27250,7 +27250,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27267,8 +27267,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index a57c7cb0aa0b2a..6e0cf5e996b3ac 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Wed Sep 8 06:06:57 2021 UTC" +#define DATE "built on: Sat Oct 16 04:11:44 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi index 6ce45d8f930700..4648e89b33d512 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/linux-elf/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-elf/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-elf/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-elf/asm/crypto/bn/bn-586.s', - './config/archs/linux-elf/asm/crypto/bn/co-586.s', - './config/archs/linux-elf/asm/crypto/bn/x86-gf2m.s', - './config/archs/linux-elf/asm/crypto/bn/x86-mont.s', - './config/archs/linux-elf/asm/crypto/des/crypt586.s', - './config/archs/linux-elf/asm/crypto/des/des-586.s', - './config/archs/linux-elf/asm/crypto/md5/md5-586.s', + './config/archs/linux-elf/asm/providers/legacy.ld', './config/archs/linux-elf/asm/providers/fips.ld', ], @@ -338,7 +332,7 @@ 'openssl_ex_libs_linux-elf': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-elf/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -350,7 +344,7 @@ 'defines': ['<@(openssl_defines_linux-elf)'], 'cflags': ['<@(openssl_cflags_linux-elf)'], 'libraries': ['<@(openssl_ex_libs_linux-elf)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..57de129ce1b94f --- /dev/null +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-legacy.gypi @@ -0,0 +1,77 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-elf': [ + + ], + 'openssl_defines_linux-elf': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_linux-elf': [ + '-Wa,--noexecstack', + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_linux-elf': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-elf)'], + 'cflags': ['<@(openssl_cflags_linux-elf)'], + 'libraries': ['<@(openssl_ex_libs_linux-elf)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-elf)'], + }, +} diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index 0c760963b30e29..4c79648fd23383 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-elf': [ './config/archs/linux-elf/asm/crypto/aes/aes-586.s', @@ -972,13 +944,7 @@ './config/archs/linux-elf/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-elf/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-elf/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-elf/asm/crypto/bn/bn-586.s', - './config/archs/linux-elf/asm/crypto/bn/co-586.s', - './config/archs/linux-elf/asm/crypto/bn/x86-gf2m.s', - './config/archs/linux-elf/asm/crypto/bn/x86-mont.s', - './config/archs/linux-elf/asm/crypto/des/crypt586.s', - './config/archs/linux-elf/asm/crypto/des/des-586.s', - './config/archs/linux-elf/asm/crypto/md5/md5-586.s', + './config/archs/linux-elf/asm/providers/legacy.ld', './config/archs/linux-elf/asm/providers/fips.ld', ], 'openssl_defines_linux-elf': [ diff --git a/deps/openssl/config/archs/linux-elf/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-elf/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-elf/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm index b08c9487d9e5b3..20f08e9a0f07d0 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -8001,9 +8001,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8021,7 +8018,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27222,8 +27222,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27250,7 +27250,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27267,8 +27267,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h index fa671e3284d05d..31e1e036576845 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Wed Sep 8 06:07:09 2021 UTC" +#define DATE "built on: Sat Oct 16 04:11:59 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi index 75287cb89a0362..1a97ef843a42dc 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/linux-elf/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-elf/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-elf/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.s', - './config/archs/linux-elf/asm_avx2/crypto/bn/co-586.s', - './config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/linux-elf/asm_avx2/crypto/des/crypt586.s', - './config/archs/linux-elf/asm_avx2/crypto/des/des-586.s', - './config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.s', + './config/archs/linux-elf/asm_avx2/providers/legacy.ld', './config/archs/linux-elf/asm_avx2/providers/fips.ld', ], @@ -338,7 +332,7 @@ 'openssl_ex_libs_linux-elf': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-elf/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -350,7 +344,7 @@ 'defines': ['<@(openssl_defines_linux-elf)'], 'cflags': ['<@(openssl_cflags_linux-elf)'], 'libraries': ['<@(openssl_ex_libs_linux-elf)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..8e4527ae1dda0f --- /dev/null +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,77 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-elf': [ + + ], + 'openssl_defines_linux-elf': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_linux-elf': [ + '-Wa,--noexecstack', + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_linux-elf': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-elf)'], + 'cflags': ['<@(openssl_cflags_linux-elf)'], + 'libraries': ['<@(openssl_ex_libs_linux-elf)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-elf)'], + }, +} diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi index fac662be17de61..347e9f3d9e0660 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-elf': [ './config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s', @@ -972,13 +944,7 @@ './config/archs/linux-elf/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-elf/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-elf/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-elf/asm_avx2/crypto/bn/bn-586.s', - './config/archs/linux-elf/asm_avx2/crypto/bn/co-586.s', - './config/archs/linux-elf/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/linux-elf/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/linux-elf/asm_avx2/crypto/des/crypt586.s', - './config/archs/linux-elf/asm_avx2/crypto/des/des-586.s', - './config/archs/linux-elf/asm_avx2/crypto/md5/md5-586.s', + './config/archs/linux-elf/asm_avx2/providers/legacy.ld', './config/archs/linux-elf/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-elf': [ diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-elf/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index 3a2e3abbc759cf..c01b12ccdf4e7f 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9639,10 +9639,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27039,8 +27039,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27067,7 +27067,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27084,8 +27084,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index d40ccd49e78754..1218528b87688f 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Wed Sep 8 06:07:20 2021 UTC" +#define DATE "built on: Sat Oct 16 04:12:14 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi index 87443c4af3a3c0..58055fab9c0cc3 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-elf/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-elf/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-elf/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-elf/no-asm/providers/legacy.ld', './config/archs/linux-elf/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux-elf': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-elf/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux-elf)'], 'cflags': ['<@(openssl_cflags_linux-elf)'], 'libraries': ['<@(openssl_ex_libs_linux-elf)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..c9e1890d722007 --- /dev/null +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-elf': [ + + ], + 'openssl_defines_linux-elf': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-elf': [ + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_linux-elf': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-elf)'], + 'cflags': ['<@(openssl_cflags_linux-elf)'], + 'libraries': ['<@(openssl_ex_libs_linux-elf)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-elf)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-elf)'], + }, +} diff --git a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi index 91e1707e88f7a0..4678abb416229a 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-elf': [ './config/archs/linux-elf/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-elf/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-elf/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-elf/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-elf/no-asm/providers/legacy.ld', './config/archs/linux-elf/no-asm/providers/fips.ld', ], 'openssl_defines_linux-elf': [ diff --git a/deps/openssl/config/archs/linux-elf/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-elf/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-elf/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm index 8583855f2a79a0..2e7d7f1f37704f 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9700,10 +9700,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27225,8 +27225,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27253,7 +27253,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27270,8 +27270,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h index 0591030fdc95ec..115fa09701939d 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Wed Sep 8 06:08:53 2021 UTC" +#define DATE "built on: Sat Oct 16 04:14:07 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc/asm/openssl-fips.gypi index 462770736f2ab1..d9f3987abbf287 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc/asm/openssl-fips.gypi @@ -295,8 +295,7 @@ './config/archs/linux-ppc/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s', + './config/archs/linux-ppc/asm/providers/legacy.ld', './config/archs/linux-ppc/asm/providers/fips.ld', ], @@ -324,7 +323,7 @@ 'openssl_ex_libs_linux-ppc': [ '-ldl -pthread -latomic', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -336,7 +335,7 @@ 'defines': ['<@(openssl_defines_linux-ppc)'], 'cflags': ['<@(openssl_cflags_linux-ppc)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..0087f557e7a3cc --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc/asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc': [ + + ], + 'openssl_defines_linux-ppc': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-ppc': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc': [ + '-ldl -pthread -latomic', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc)'], + 'cflags': ['<@(openssl_cflags_linux-ppc)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi index 065ae56d29b362..f70f5608ef8cac 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc/asm/openssl.gypi @@ -925,37 +925,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc': [ './config/archs/linux-ppc/asm/crypto/aes/aes-ppc.s', @@ -980,8 +949,7 @@ './config/archs/linux-ppc/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc/asm/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc/asm/crypto/bn/ppc-mont.s', + './config/archs/linux-ppc/asm/providers/legacy.ld', './config/archs/linux-ppc/asm/providers/fips.ld', ], 'openssl_defines_linux-ppc': [ diff --git a/deps/openssl/config/archs/linux-ppc/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm index e81cb56ef5ba6f..151776da5ee81f 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7974,6 +7974,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7991,10 +7994,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9700,10 +9700,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27225,8 +27225,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27253,7 +27253,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27270,8 +27270,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h index b3126d22f2da1a..88635a9bda2d8b 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Wed Sep 8 06:09:04 2021 UTC" +#define DATE "built on: Sat Oct 16 04:14:22 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-fips.gypi index e23292366bdfeb..0567b781b76f03 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-fips.gypi @@ -295,8 +295,7 @@ './config/archs/linux-ppc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc/asm_avx2/crypto/bn/ppc-mont.s', + './config/archs/linux-ppc/asm_avx2/providers/legacy.ld', './config/archs/linux-ppc/asm_avx2/providers/fips.ld', ], @@ -324,7 +323,7 @@ 'openssl_ex_libs_linux-ppc': [ '-ldl -pthread -latomic', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -336,7 +335,7 @@ 'defines': ['<@(openssl_defines_linux-ppc)'], 'cflags': ['<@(openssl_cflags_linux-ppc)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..c37cecab0fd1e6 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc': [ + + ], + 'openssl_defines_linux-ppc': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-ppc': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc': [ + '-ldl -pthread -latomic', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc)'], + 'cflags': ['<@(openssl_cflags_linux-ppc)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl.gypi index 5e57d167ae3093..ff3d4eae0259b3 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/openssl.gypi @@ -925,37 +925,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc': [ './config/archs/linux-ppc/asm_avx2/crypto/aes/aes-ppc.s', @@ -980,8 +949,7 @@ './config/archs/linux-ppc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc/asm_avx2/crypto/bn/ppc-mont.s', + './config/archs/linux-ppc/asm_avx2/providers/legacy.ld', './config/archs/linux-ppc/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-ppc': [ diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm index 14bb67ee05448e..bfac275a78539e 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7946,9 +7946,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7966,7 +7963,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27040,8 +27040,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27068,7 +27068,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27085,8 +27085,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h index cbbfdaac288ad0..2783be312ba9de 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Wed Sep 8 06:09:16 2021 UTC" +#define DATE "built on: Sat Oct 16 04:14:36 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc/no-asm/openssl-fips.gypi index 01ecece0bc3928..6e1a05df574bc9 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-ppc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-ppc/no-asm/providers/legacy.ld', './config/archs/linux-ppc/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux-ppc': [ '-ldl -pthread -latomic', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux-ppc)'], 'cflags': ['<@(openssl_cflags_linux-ppc)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..2d20630bca5950 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc': [ + + ], + 'openssl_defines_linux-ppc': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-ppc': [ + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc': [ + '-ldl -pthread -latomic', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc)'], + 'cflags': ['<@(openssl_cflags_linux-ppc)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi index 1ff07cf167ebe4..852814c2940deb 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc': [ './config/archs/linux-ppc/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-ppc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-ppc/no-asm/providers/legacy.ld', './config/archs/linux-ppc/no-asm/providers/fips.ld', ], 'openssl_defines_linux-ppc': [ diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm index 8d20c583c9277c..5e300935a2b9b8 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7981,9 +7981,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8001,7 +7998,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27287,8 +27287,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27315,7 +27315,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27332,8 +27332,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h index 585258051128b1..96cda2bcbaf619 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Wed Sep 8 06:09:27 2021 UTC" +#define DATE "built on: Sat Oct 16 04:14:49 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64/asm/openssl-fips.gypi index fa1751505208b2..1565a59ebf7c90 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64/asm/openssl-fips.gypi @@ -300,9 +300,7 @@ './config/archs/linux-ppc64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64/asm/providers/legacy.ld', './config/archs/linux-ppc64/asm/providers/fips.ld', ], @@ -333,7 +331,7 @@ 'openssl_ex_libs_linux-ppc64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc64/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -345,7 +343,7 @@ 'defines': ['<@(openssl_defines_linux-ppc64)'], 'cflags': ['<@(openssl_cflags_linux-ppc64)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc64/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc64/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..46a462336f7e56 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64/asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc64': [ + + ], + 'openssl_defines_linux-ppc64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-ppc64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc64)'], + 'cflags': ['<@(openssl_cflags_linux-ppc64)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi index 01715c1c9106f4..ff6fdde0dcbdf9 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi @@ -926,37 +926,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc64': [ './config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s', @@ -985,9 +954,7 @@ './config/archs/linux-ppc64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64/asm/providers/legacy.ld', './config/archs/linux-ppc64/asm/providers/fips.ld', ], 'openssl_defines_linux-ppc64': [ diff --git a/deps/openssl/config/archs/linux-ppc64/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc64/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm index f164a924079305..7209e16f83a94b 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7981,6 +7981,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7998,10 +8001,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9718,10 +9718,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27287,8 +27287,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27315,7 +27315,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27332,8 +27332,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h index f231ea435c2406..ecb8f84d11226b 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Wed Sep 8 06:09:38 2021 UTC" +#define DATE "built on: Sat Oct 16 04:15:04 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-fips.gypi index 1615a3080c36b5..b95ce119be94d4 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-fips.gypi @@ -300,9 +300,7 @@ './config/archs/linux-ppc64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64/asm_avx2/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64/asm_avx2/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64/asm_avx2/providers/legacy.ld', './config/archs/linux-ppc64/asm_avx2/providers/fips.ld', ], @@ -333,7 +331,7 @@ 'openssl_ex_libs_linux-ppc64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc64/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -345,7 +343,7 @@ 'defines': ['<@(openssl_defines_linux-ppc64)'], 'cflags': ['<@(openssl_cflags_linux-ppc64)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..d617c06b32fd72 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc64': [ + + ], + 'openssl_defines_linux-ppc64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-ppc64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc64)'], + 'cflags': ['<@(openssl_cflags_linux-ppc64)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl.gypi index 306e181cddcd51..592a2e6cde2ec5 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/openssl.gypi @@ -926,37 +926,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc64': [ './config/archs/linux-ppc64/asm_avx2/crypto/aes/aes-ppc.s', @@ -985,9 +954,7 @@ './config/archs/linux-ppc64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64/asm_avx2/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64/asm_avx2/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64/asm_avx2/providers/legacy.ld', './config/archs/linux-ppc64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-ppc64': [ diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm index 7dfe2a1e753afa..c40fec799ae537 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27041,8 +27041,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27069,7 +27069,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27086,8 +27086,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h index 13905502344780..8a1d9a203652be 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Wed Sep 8 06:09:50 2021 UTC" +#define DATE "built on: Sat Oct 16 04:15:18 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-fips.gypi index 6a805346a056d1..bbb78900357a44 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-ppc64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-ppc64/no-asm/providers/legacy.ld', './config/archs/linux-ppc64/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux-ppc64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc64/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux-ppc64)'], 'cflags': ['<@(openssl_cflags_linux-ppc64)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..bedbac86dc7174 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc64': [ + + ], + 'openssl_defines_linux-ppc64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-ppc64': [ + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc64)'], + 'cflags': ['<@(openssl_cflags_linux-ppc64)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi index 981efa8b39fd7e..7b190810e7f7f6 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc64': [ './config/archs/linux-ppc64/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-ppc64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-ppc64/no-asm/providers/legacy.ld', './config/archs/linux-ppc64/no-asm/providers/fips.ld', ], 'openssl_defines_linux-ppc64': [ diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc64/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index f037f2475f5b9f..9cbfa3058addec 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27286,8 +27286,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27314,7 +27314,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27331,8 +27331,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index c6abb250c1b68e..7d5c047f35344b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Wed Sep 8 06:10:00 2021 UTC" +#define DATE "built on: Sat Oct 16 04:15:31 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi index 98503340618a03..5c9c62be48efd1 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi @@ -300,9 +300,7 @@ './config/archs/linux-ppc64le/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64le/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64le/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64le/asm/providers/legacy.ld', './config/archs/linux-ppc64le/asm/providers/fips.ld', ], @@ -333,7 +331,7 @@ 'openssl_ex_libs_linux-ppc64le': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc64le/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -345,7 +343,7 @@ 'defines': ['<@(openssl_defines_linux-ppc64le)'], 'cflags': ['<@(openssl_cflags_linux-ppc64le)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc64le)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..f5355e3233f877 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc64le': [ + + ], + 'openssl_defines_linux-ppc64le': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-ppc64le': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc64le': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc64le)'], + 'cflags': ['<@(openssl_cflags_linux-ppc64le)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc64le)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc64le)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi index efbf73fe255bf3..76a84273fe5374 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl.gypi @@ -926,37 +926,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc64le': [ './config/archs/linux-ppc64le/asm/crypto/aes/aes-ppc.s', @@ -985,9 +954,7 @@ './config/archs/linux-ppc64le/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64le/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64le/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64le/asm/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64le/asm/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64le/asm/providers/legacy.ld', './config/archs/linux-ppc64le/asm/providers/fips.ld', ], 'openssl_defines_linux-ppc64le': [ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc64le/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64le/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm index 95a73a78c0abfa..60eba54caca925 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7980,9 +7980,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8000,7 +7997,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27286,8 +27286,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27314,7 +27314,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27331,8 +27331,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h index fb2fb8c6827d7a..4603ae530eaf11 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Wed Sep 8 06:10:12 2021 UTC" +#define DATE "built on: Sat Oct 16 04:15:46 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi index bc9feaebdfa9a4..f78738ff26a43f 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-fips.gypi @@ -300,9 +300,7 @@ './config/archs/linux-ppc64le/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64le/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64le/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64le/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64le/asm_avx2/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64le/asm_avx2/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64le/asm_avx2/providers/legacy.ld', './config/archs/linux-ppc64le/asm_avx2/providers/fips.ld', ], @@ -333,7 +331,7 @@ 'openssl_ex_libs_linux-ppc64le': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc64le/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -345,7 +343,7 @@ 'defines': ['<@(openssl_defines_linux-ppc64le)'], 'cflags': ['<@(openssl_cflags_linux-ppc64le)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc64le)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..da3153078887d7 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_ppc.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc64le': [ + + ], + 'openssl_defines_linux-ppc64le': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux-ppc64le': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc64le': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc64le)'], + 'cflags': ['<@(openssl_cflags_linux-ppc64le)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc64le)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc64le)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi index 8aa32f0ce7ac64..af16abbc5ca026 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/openssl.gypi @@ -926,37 +926,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_ppc.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc64le': [ './config/archs/linux-ppc64le/asm_avx2/crypto/aes/aes-ppc.s', @@ -985,9 +954,7 @@ './config/archs/linux-ppc64le/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64le/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64le/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-ppc64le/asm_avx2/crypto/bn/bn-ppc.s', - './config/archs/linux-ppc64le/asm_avx2/crypto/bn/ppc-mont.s', - './config/archs/linux-ppc64le/asm_avx2/crypto/bn/ppc64-mont-fixed.s', + './config/archs/linux-ppc64le/asm_avx2/providers/legacy.ld', './config/archs/linux-ppc64le/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-ppc64le': [ diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index 6783209588b4fe..92a35c4ed43ae0 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7946,9 +7946,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7966,7 +7963,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27040,8 +27040,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27068,7 +27068,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27085,8 +27085,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index 31981b7a25f9ac..f7c0442975c1c7 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Wed Sep 8 06:10:24 2021 UTC" +#define DATE "built on: Sat Oct 16 04:16:01 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi index f9d6e2adf52440..444122b114fc37 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-ppc64le/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64le/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64le/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-ppc64le/no-asm/providers/legacy.ld', './config/archs/linux-ppc64le/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux-ppc64le': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-ppc64le/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux-ppc64le)'], 'cflags': ['<@(openssl_cflags_linux-ppc64le)'], 'libraries': ['<@(openssl_ex_libs_linux-ppc64le)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..85c2acd3c83f97 --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-ppc64le': [ + + ], + 'openssl_defines_linux-ppc64le': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-ppc64le': [ + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-ppc64le': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-ppc64le)'], + 'cflags': ['<@(openssl_cflags_linux-ppc64le)'], + 'libraries': ['<@(openssl_ex_libs_linux-ppc64le)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-ppc64le)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-ppc64le)'], + }, +} diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi index d2b77dc56a4e07..7c6453a0c70cc0 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-ppc64le': [ './config/archs/linux-ppc64le/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-ppc64le/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-ppc64le/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-ppc64le/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-ppc64le/no-asm/providers/legacy.ld', './config/archs/linux-ppc64le/no-asm/providers/fips.ld', ], 'openssl_defines_linux-ppc64le': [ diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-ppc64le/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-x32/asm/configdata.pm b/deps/openssl/config/archs/linux-x32/asm/configdata.pm index ebde1ae2ef1ce4..8675bfb3101443 100644 --- a/deps/openssl/config/archs/linux-x32/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -8005,9 +8005,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8025,7 +8022,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9767,10 +9767,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27392,8 +27392,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27420,7 +27420,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27437,8 +27437,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h index b9710a5679685a..eff470bd0b8e7b 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x32" -#define DATE "built on: Wed Sep 8 06:07:31 2021 UTC" +#define DATE "built on: Sat Oct 16 04:12:27 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl-fips.gypi index e9e77a8df98577..77e3333dbb7d35 100644 --- a/deps/openssl/config/archs/linux-x32/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x32/asm/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/linux-x32/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x32/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x32/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x32/asm/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s', - './config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s', + './config/archs/linux-x32/asm/providers/legacy.ld', './config/archs/linux-x32/asm/providers/fips.ld', ], @@ -352,7 +346,7 @@ 'openssl_ex_libs_linux-x32': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-x32/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -364,7 +358,7 @@ 'defines': ['<@(openssl_defines_linux-x32)'], 'cflags': ['<@(openssl_cflags_linux-x32)'], 'libraries': ['<@(openssl_ex_libs_linux-x32)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x32)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..30404436bdbeb0 --- /dev/null +++ b/deps/openssl/config/archs/linux-x32/asm/openssl-legacy.gypi @@ -0,0 +1,81 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-x32': [ + + ], + 'openssl_defines_linux-x32': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_linux-x32': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -mx32', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-x32': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-x32)'], + 'cflags': ['<@(openssl_cflags_linux-x32)'], + 'libraries': ['<@(openssl_ex_libs_linux-x32)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x32)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-x32)'], + }, +} diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl.gypi index 4280f547ba0654..5a4cb621c3d98e 100644 --- a/deps/openssl/config/archs/linux-x32/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x32/asm/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-x32': [ './config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s', @@ -990,13 +957,7 @@ './config/archs/linux-x32/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x32/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x32/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x32/asm/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x32/asm/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x32/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x32/asm/crypto/bn/x86_64-mont.s', - './config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x32/asm/crypto/md5/md5-x86_64.s', + './config/archs/linux-x32/asm/providers/legacy.ld', './config/archs/linux-x32/asm/providers/fips.ld', ], 'openssl_defines_linux-x32': [ diff --git a/deps/openssl/config/archs/linux-x32/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-x32/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-x32/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm index f932620b90fd33..a1469001c3daf7 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9767,10 +9767,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27392,8 +27392,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27420,7 +27420,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27437,8 +27437,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h index 4d4910b2066d7a..a137d43d7bac48 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x32" -#define DATE "built on: Wed Sep 8 06:07:46 2021 UTC" +#define DATE "built on: Sat Oct 16 04:12:46 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-fips.gypi index 081336d7959643..956fe80c2b311d 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/linux-x32/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-x32/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-x32/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x32/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/linux-x32/asm_avx2/providers/legacy.ld', './config/archs/linux-x32/asm_avx2/providers/fips.ld', ], @@ -352,7 +346,7 @@ 'openssl_ex_libs_linux-x32': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-x32/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -364,7 +358,7 @@ 'defines': ['<@(openssl_defines_linux-x32)'], 'cflags': ['<@(openssl_cflags_linux-x32)'], 'libraries': ['<@(openssl_ex_libs_linux-x32)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x32)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..dccc02a2b547e5 --- /dev/null +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,81 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-x32': [ + + ], + 'openssl_defines_linux-x32': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_linux-x32': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -mx32', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-x32': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-x32)'], + 'cflags': ['<@(openssl_cflags_linux-x32)'], + 'libraries': ['<@(openssl_ex_libs_linux-x32)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x32)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-x32)'], + }, +} diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi index ce9361749decf9..bf5af926ad21a5 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-x32': [ './config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s', @@ -990,13 +957,7 @@ './config/archs/linux-x32/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-x32/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-x32/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x32/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/linux-x32/asm_avx2/providers/legacy.ld', './config/archs/linux-x32/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-x32': [ diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-x32/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm index 9ac40bdc20dd16..8002c7a3ad3bef 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27040,8 +27040,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27068,7 +27068,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27085,8 +27085,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h index c1bb121240702e..3968c4be16d093 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x32" -#define DATE "built on: Wed Sep 8 06:08:02 2021 UTC" +#define DATE "built on: Sat Oct 16 04:13:04 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x32/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x32/no-asm/openssl-fips.gypi index 8a2c9a387ff701..98a14ea9d8e42d 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x32/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-x32/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x32/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x32/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-x32/no-asm/providers/legacy.ld', './config/archs/linux-x32/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux-x32': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-x32/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux-x32)'], 'cflags': ['<@(openssl_cflags_linux-x32)'], 'libraries': ['<@(openssl_ex_libs_linux-x32)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x32)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-x32/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-x32/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..ab5c7dfc9019ac --- /dev/null +++ b/deps/openssl/config/archs/linux-x32/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-x32': [ + + ], + 'openssl_defines_linux-x32': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-x32': [ + '-Wall -O3', + '-pthread -mx32', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-x32': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-x32)'], + 'cflags': ['<@(openssl_cflags_linux-x32)'], + 'libraries': ['<@(openssl_ex_libs_linux-x32)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x32)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-x32)'], + }, +} diff --git a/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi index 11bf69acfdbedb..f40d74058f461c 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x32/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-x32': [ './config/archs/linux-x32/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-x32/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x32/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x32/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-x32/no-asm/providers/legacy.ld', './config/archs/linux-x32/no-asm/providers/fips.ld', ], 'openssl_defines_linux-x32': [ diff --git a/deps/openssl/config/archs/linux-x32/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-x32/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-x32/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 719cc4a38d8d3e..65331c93657652 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -8006,6 +8006,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8023,10 +8026,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -27393,8 +27393,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27421,7 +27421,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27438,8 +27438,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index 4d5eb21c85e39f..7ff34076f2db3c 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Wed Sep 8 06:08:12 2021 UTC" +#define DATE "built on: Sat Oct 16 04:13:17 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi index 4b47c368174b6c..12c12f20e7a9b2 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/linux-x86_64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x86_64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x86_64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s', - './config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s', + './config/archs/linux-x86_64/asm/providers/legacy.ld', './config/archs/linux-x86_64/asm/providers/fips.ld', ], @@ -352,7 +346,7 @@ 'openssl_ex_libs_linux-x86_64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-x86_64/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -364,7 +358,7 @@ 'defines': ['<@(openssl_defines_linux-x86_64)'], 'cflags': ['<@(openssl_cflags_linux-x86_64)'], 'libraries': ['<@(openssl_ex_libs_linux-x86_64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..3b2cb8e73a70f7 --- /dev/null +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-legacy.gypi @@ -0,0 +1,81 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-x86_64': [ + + ], + 'openssl_defines_linux-x86_64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_linux-x86_64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-x86_64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-x86_64)'], + 'cflags': ['<@(openssl_cflags_linux-x86_64)'], + 'libraries': ['<@(openssl_ex_libs_linux-x86_64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-x86_64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index 46cc9b2b4afa65..9a7d1fabbdcc52 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-x86_64': [ './config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s', @@ -990,13 +957,7 @@ './config/archs/linux-x86_64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x86_64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x86_64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x86_64/asm/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x86_64/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont.s', - './config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x86_64/asm/crypto/md5/md5-x86_64.s', + './config/archs/linux-x86_64/asm/providers/legacy.ld', './config/archs/linux-x86_64/asm/providers/fips.ld', ], 'openssl_defines_linux-x86_64': [ diff --git a/deps/openssl/config/archs/linux-x86_64/asm/providers/legacy.ld b/deps/openssl/config/archs/linux-x86_64/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-x86_64/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm index 8fbd35dd18dcbc..88238295a2dcea 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9768,10 +9768,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27393,8 +27393,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27421,7 +27421,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27438,8 +27438,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h index 32aa7ed14ac98a..6872bff18794b0 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Wed Sep 8 06:08:28 2021 UTC" +#define DATE "built on: Sat Oct 16 04:13:36 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi index 48bdb69edb1ba6..a046e2ff750b48 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/linux-x86_64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-x86_64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-x86_64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x86_64/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/linux-x86_64/asm_avx2/providers/legacy.ld', './config/archs/linux-x86_64/asm_avx2/providers/fips.ld', ], @@ -352,7 +346,7 @@ 'openssl_ex_libs_linux-x86_64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-x86_64/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -364,7 +358,7 @@ 'defines': ['<@(openssl_defines_linux-x86_64)'], 'cflags': ['<@(openssl_cflags_linux-x86_64)'], 'libraries': ['<@(openssl_ex_libs_linux-x86_64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..515c1ac2d97eef --- /dev/null +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,81 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-x86_64': [ + + ], + 'openssl_defines_linux-x86_64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_linux-x86_64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-x86_64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-x86_64)'], + 'cflags': ['<@(openssl_cflags_linux-x86_64)'], + 'libraries': ['<@(openssl_ex_libs_linux-x86_64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-x86_64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi index cb90c5733898ee..cdff1465427f1f 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-x86_64': [ './config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s', @@ -990,13 +957,7 @@ './config/archs/linux-x86_64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux-x86_64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux-x86_64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/linux-x86_64/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/linux-x86_64/asm_avx2/providers/legacy.ld', './config/archs/linux-x86_64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux-x86_64': [ diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index 40bd89982b46a3..80d996c5515492 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7947,9 +7947,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7967,7 +7964,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9641,10 +9641,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27041,8 +27041,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27069,7 +27069,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27086,8 +27086,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index 1630703b4a5900..deb3afb6cf19c4 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Wed Sep 8 06:08:43 2021 UTC" +#define DATE "built on: Sat Oct 16 04:13:54 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi index 03cb14c077ac12..d0cb6a348d25fa 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux-x86_64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x86_64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x86_64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-x86_64/no-asm/providers/legacy.ld', './config/archs/linux-x86_64/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux-x86_64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux-x86_64/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux-x86_64)'], 'cflags': ['<@(openssl_cflags_linux-x86_64)'], 'libraries': ['<@(openssl_ex_libs_linux-x86_64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..a362ba92777fc1 --- /dev/null +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux-x86_64': [ + + ], + 'openssl_defines_linux-x86_64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux-x86_64': [ + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux-x86_64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux-x86_64)'], + 'cflags': ['<@(openssl_cflags_linux-x86_64)'], + 'libraries': ['<@(openssl_ex_libs_linux-x86_64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux-x86_64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux-x86_64)'], + }, +} diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi index 647092c4101ec9..c1dea4a46ec2b1 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux-x86_64': [ './config/archs/linux-x86_64/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux-x86_64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux-x86_64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux-x86_64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux-x86_64/no-asm/providers/legacy.ld', './config/archs/linux-x86_64/no-asm/providers/fips.ld', ], 'openssl_defines_linux-x86_64': [ diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux-x86_64/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 927db939b0125a..2e50808dc96050 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9699,10 +9699,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27222,8 +27222,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27250,7 +27250,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27267,8 +27267,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index 3bd35f670e2c6b..4b4522dd0b6b8f 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Wed Sep 8 06:10:34 2021 UTC" +#define DATE "built on: Sat Oct 16 04:16:14 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi index 8c6c7438042012..a9eeaf3cc6b367 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi @@ -290,8 +290,7 @@ './config/archs/linux32-s390x/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux32-s390x/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux32-s390x/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux32-s390x/asm/crypto/bn/s390x-gf2m.s', - './config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S', + './config/archs/linux32-s390x/asm/providers/legacy.ld', './config/archs/linux32-s390x/asm/providers/fips.ld', ], @@ -324,7 +323,7 @@ 'openssl_ex_libs_linux32-s390x': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux32-s390x/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -336,7 +335,7 @@ 'defines': ['<@(openssl_defines_linux32-s390x)'], 'cflags': ['<@(openssl_cflags_linux32-s390x)'], 'libraries': ['<@(openssl_ex_libs_linux32-s390x)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..6810b967256faf --- /dev/null +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-legacy.gypi @@ -0,0 +1,76 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux32-s390x': [ + + ], + 'openssl_defines_linux32-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux32-s390x': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m31 -Wa,-mzarch', + '-Wall -O3', + ], + 'openssl_ex_libs_linux32-s390x': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux32-s390x)'], + 'cflags': ['<@(openssl_cflags_linux32-s390x)'], + 'libraries': ['<@(openssl_ex_libs_linux32-s390x)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux32-s390x)'], + }, +} diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi index 27ee163f9700f1..c3b5d1f048afd5 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi @@ -920,37 +920,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux32-s390x': [ './config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S', @@ -972,8 +941,7 @@ './config/archs/linux32-s390x/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux32-s390x/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux32-s390x/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux32-s390x/asm/crypto/bn/s390x-gf2m.s', - './config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S', + './config/archs/linux32-s390x/asm/providers/legacy.ld', './config/archs/linux32-s390x/asm/providers/fips.ld', ], 'openssl_defines_linux32-s390x': [ diff --git a/deps/openssl/config/archs/linux32-s390x/asm/providers/legacy.ld b/deps/openssl/config/archs/linux32-s390x/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux32-s390x/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm index 2a5036ebddbac6..0a994c4adeb429 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9699,10 +9699,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27222,8 +27222,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27250,7 +27250,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27267,8 +27267,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h index 4948ab2194e51d..e32cbf0bbf2ae4 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Wed Sep 8 06:10:45 2021 UTC" +#define DATE "built on: Sat Oct 16 04:16:28 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi index 439276d3fea979..a23404b5578e30 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-fips.gypi @@ -290,8 +290,7 @@ './config/archs/linux32-s390x/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux32-s390x/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux32-s390x/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-gf2m.s', - './config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S', + './config/archs/linux32-s390x/asm_avx2/providers/legacy.ld', './config/archs/linux32-s390x/asm_avx2/providers/fips.ld', ], @@ -324,7 +323,7 @@ 'openssl_ex_libs_linux32-s390x': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux32-s390x/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -336,7 +335,7 @@ 'defines': ['<@(openssl_defines_linux32-s390x)'], 'cflags': ['<@(openssl_cflags_linux32-s390x)'], 'libraries': ['<@(openssl_ex_libs_linux32-s390x)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..647b5e14f0f4f6 --- /dev/null +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,76 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux32-s390x': [ + + ], + 'openssl_defines_linux32-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux32-s390x': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m31 -Wa,-mzarch', + '-Wall -O3', + ], + 'openssl_ex_libs_linux32-s390x': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux32-s390x)'], + 'cflags': ['<@(openssl_cflags_linux32-s390x)'], + 'libraries': ['<@(openssl_ex_libs_linux32-s390x)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux32-s390x)'], + }, +} diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi index 81c7e5a5c085d9..097bce270dfe4b 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/openssl.gypi @@ -920,37 +920,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux32-s390x': [ './config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S', @@ -972,8 +941,7 @@ './config/archs/linux32-s390x/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux32-s390x/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux32-s390x/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-gf2m.s', - './config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S', + './config/archs/linux32-s390x/asm_avx2/providers/legacy.ld', './config/archs/linux32-s390x/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux32-s390x': [ diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index 89848c825a7d5c..2fc3fe01abd26e 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7946,9 +7946,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7966,7 +7963,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27040,8 +27040,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27068,7 +27068,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27085,8 +27085,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index f9eb8ef339a988..582133e7df2453 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Wed Sep 8 06:10:56 2021 UTC" +#define DATE "built on: Sat Oct 16 04:16:43 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi index d8827aa4e7fb11..a2fa97ac0807b4 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux32-s390x/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux32-s390x/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux32-s390x/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux32-s390x/no-asm/providers/legacy.ld', './config/archs/linux32-s390x/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux32-s390x': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux32-s390x/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux32-s390x)'], 'cflags': ['<@(openssl_cflags_linux32-s390x)'], 'libraries': ['<@(openssl_ex_libs_linux32-s390x)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..4eefa1a1ebf510 --- /dev/null +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux32-s390x': [ + + ], + 'openssl_defines_linux32-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux32-s390x': [ + '-Wall -O3', + '-pthread -m31 -Wa,-mzarch', + '-Wall -O3', + ], + 'openssl_ex_libs_linux32-s390x': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux32-s390x)'], + 'cflags': ['<@(openssl_cflags_linux32-s390x)'], + 'libraries': ['<@(openssl_ex_libs_linux32-s390x)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux32-s390x)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux32-s390x)'], + }, +} diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi index 39405843c74484..272367d6c50b36 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/openssl.gypi @@ -924,37 +924,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux32-s390x': [ './config/archs/linux32-s390x/no-asm/providers/common/der/der_sm2_gen.c', @@ -964,6 +933,7 @@ './config/archs/linux32-s390x/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux32-s390x/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux32-s390x/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux32-s390x/no-asm/providers/legacy.ld', './config/archs/linux32-s390x/no-asm/providers/fips.ld', ], 'openssl_defines_linux32-s390x': [ diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux32-s390x/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index cc0c16d3aa3455..9e8353c6a62bda 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9672,10 +9672,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27154,8 +27154,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27182,7 +27182,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27199,8 +27199,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h index c00c6b916ad866..93f1eaf3749cc2 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Wed Sep 8 06:11:40 2021 UTC" +#define DATE "built on: Sat Oct 16 04:17:38 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi index 8acdd8d5148f87..a6afbb3c050ffe 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi @@ -284,8 +284,7 @@ './config/archs/linux64-mips64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-mips64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-mips64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-mips64/asm/crypto/bn/bn-mips.S', - './config/archs/linux64-mips64/asm/crypto/bn/mips-mont.S', + './config/archs/linux64-mips64/asm/providers/legacy.ld', './config/archs/linux64-mips64/asm/providers/fips.ld', ], @@ -310,7 +309,7 @@ 'openssl_ex_libs_linux64-mips64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-mips64/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -322,7 +321,7 @@ 'defines': ['<@(openssl_defines_linux64-mips64)'], 'cflags': ['<@(openssl_cflags_linux64-mips64)'], 'libraries': ['<@(openssl_ex_libs_linux64-mips64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..e9671d626de721 --- /dev/null +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-mips64': [ + + ], + 'openssl_defines_linux64-mips64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux64-mips64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -mabi=64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-mips64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-mips64)'], + 'cflags': ['<@(openssl_cflags_linux64-mips64)'], + 'libraries': ['<@(openssl_ex_libs_linux64-mips64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-mips64)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi index b5734840e7913f..2c818778847bd8 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl.gypi @@ -921,36 +921,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-mips64': [ './config/archs/linux64-mips64/asm/crypto/aes/aes-mips.S', @@ -967,8 +937,7 @@ './config/archs/linux64-mips64/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-mips64/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-mips64/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-mips64/asm/crypto/bn/bn-mips.S', - './config/archs/linux64-mips64/asm/crypto/bn/mips-mont.S', + './config/archs/linux64-mips64/asm/providers/legacy.ld', './config/archs/linux64-mips64/asm/providers/fips.ld', ], 'openssl_defines_linux64-mips64': [ diff --git a/deps/openssl/config/archs/linux64-mips64/asm/providers/legacy.ld b/deps/openssl/config/archs/linux64-mips64/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-mips64/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm index 0212ff26d397df..0e39ed34aa0dc2 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -9672,10 +9672,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27154,8 +27154,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27182,7 +27182,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27199,8 +27199,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h index b1a738c84eb44a..fa6f48ee544070 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Wed Sep 8 06:11:51 2021 UTC" +#define DATE "built on: Sat Oct 16 04:17:52 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi index 374319d8faca30..d85528d71d71bb 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi @@ -284,8 +284,7 @@ './config/archs/linux64-mips64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux64-mips64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux64-mips64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-mips64/asm_avx2/crypto/bn/bn-mips.S', - './config/archs/linux64-mips64/asm_avx2/crypto/bn/mips-mont.S', + './config/archs/linux64-mips64/asm_avx2/providers/legacy.ld', './config/archs/linux64-mips64/asm_avx2/providers/fips.ld', ], @@ -310,7 +309,7 @@ 'openssl_ex_libs_linux64-mips64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-mips64/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -322,7 +321,7 @@ 'defines': ['<@(openssl_defines_linux64-mips64)'], 'cflags': ['<@(openssl_cflags_linux64-mips64)'], 'libraries': ['<@(openssl_ex_libs_linux64-mips64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..fbe9a236df7b1c --- /dev/null +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-mips64': [ + + ], + 'openssl_defines_linux64-mips64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux64-mips64': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -mabi=64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-mips64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-mips64)'], + 'cflags': ['<@(openssl_cflags_linux64-mips64)'], + 'libraries': ['<@(openssl_ex_libs_linux64-mips64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-mips64)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi index 0a152dc1b46ff7..e31503501e8aaa 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl.gypi @@ -921,36 +921,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-mips64': [ './config/archs/linux64-mips64/asm_avx2/crypto/aes/aes-mips.S', @@ -967,8 +937,7 @@ './config/archs/linux64-mips64/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux64-mips64/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux64-mips64/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-mips64/asm_avx2/crypto/bn/bn-mips.S', - './config/archs/linux64-mips64/asm_avx2/crypto/bn/mips-mont.S', + './config/archs/linux64-mips64/asm_avx2/providers/legacy.ld', './config/archs/linux64-mips64/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux64-mips64': [ diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm index a1a417d9042476..addc7af4d138a3 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7947,9 +7947,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7967,7 +7964,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9641,10 +9641,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27041,8 +27041,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27069,7 +27069,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27086,8 +27086,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h index 2f144a5e59bfa7..0d8794c5f8d718 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Wed Sep 8 06:12:01 2021 UTC" +#define DATE "built on: Sat Oct 16 04:18:05 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi index 3f553c571b0066..52c88fb4a64b0a 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux64-mips64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-mips64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-mips64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux64-mips64/no-asm/providers/legacy.ld', './config/archs/linux64-mips64/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_linux64-mips64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-mips64/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_linux64-mips64)'], 'cflags': ['<@(openssl_cflags_linux64-mips64)'], 'libraries': ['<@(openssl_ex_libs_linux64-mips64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..5d803697365796 --- /dev/null +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-mips64': [ + + ], + 'openssl_defines_linux64-mips64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux64-mips64': [ + '-Wall -O3', + '-pthread -mabi=64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-mips64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-mips64)'], + 'cflags': ['<@(openssl_cflags_linux64-mips64)'], + 'libraries': ['<@(openssl_ex_libs_linux64-mips64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-mips64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-mips64)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi index 2583d9854fdff5..6ee55ba3ac8ec2 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-mips64': [ './config/archs/linux64-mips64/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux64-mips64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-mips64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-mips64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux64-mips64/no-asm/providers/legacy.ld', './config/archs/linux64-mips64/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-mips64': [ diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux64-mips64/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm index b65d17af462118..3a2d4354caf8ba 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/configdata.pm @@ -901,18 +901,9 @@ our %unified_info = ( "test/buildtest_c_aes" => { "noinst" => "1" }, - "test/buildtest_c_asn1" => { - "noinst" => "1" - }, - "test/buildtest_c_asn1t" => { - "noinst" => "1" - }, "test/buildtest_c_async" => { "noinst" => "1" }, - "test/buildtest_c_bio" => { - "noinst" => "1" - }, "test/buildtest_c_blowfish" => { "noinst" => "1" }, @@ -931,24 +922,12 @@ our %unified_info = ( "test/buildtest_c_cmac" => { "noinst" => "1" }, - "test/buildtest_c_cmp" => { - "noinst" => "1" - }, "test/buildtest_c_cmp_util" => { "noinst" => "1" }, - "test/buildtest_c_cms" => { - "noinst" => "1" - }, - "test/buildtest_c_conf" => { - "noinst" => "1" - }, "test/buildtest_c_conf_api" => { "noinst" => "1" }, - "test/buildtest_c_configuration" => { - "noinst" => "1" - }, "test/buildtest_c_conftypes" => { "noinst" => "1" }, @@ -964,18 +943,9 @@ our %unified_info = ( "test/buildtest_c_core_object" => { "noinst" => "1" }, - "test/buildtest_c_crmf" => { - "noinst" => "1" - }, - "test/buildtest_c_crypto" => { - "noinst" => "1" - }, "test/buildtest_c_cryptoerr_legacy" => { "noinst" => "1" }, - "test/buildtest_c_ct" => { - "noinst" => "1" - }, "test/buildtest_c_decoder" => { "noinst" => "1" }, @@ -1012,18 +982,12 @@ our %unified_info = ( "test/buildtest_c_engine" => { "noinst" => "1" }, - "test/buildtest_c_ess" => { - "noinst" => "1" - }, "test/buildtest_c_evp" => { "noinst" => "1" }, "test/buildtest_c_fips_names" => { "noinst" => "1" }, - "test/buildtest_c_fipskey" => { - "noinst" => "1" - }, "test/buildtest_c_hmac" => { "noinst" => "1" }, @@ -1036,9 +1000,6 @@ our %unified_info = ( "test/buildtest_c_kdf" => { "noinst" => "1" }, - "test/buildtest_c_lhash" => { - "noinst" => "1" - }, "test/buildtest_c_macros" => { "noinst" => "1" }, @@ -1060,12 +1021,6 @@ our %unified_info = ( "test/buildtest_c_objects" => { "noinst" => "1" }, - "test/buildtest_c_ocsp" => { - "noinst" => "1" - }, - "test/buildtest_c_opensslv" => { - "noinst" => "1" - }, "test/buildtest_c_ossl_typ" => { "noinst" => "1" }, @@ -1081,12 +1036,6 @@ our %unified_info = ( "test/buildtest_c_pem2" => { "noinst" => "1" }, - "test/buildtest_c_pkcs12" => { - "noinst" => "1" - }, - "test/buildtest_c_pkcs7" => { - "noinst" => "1" - }, "test/buildtest_c_prov_ssl" => { "noinst" => "1" }, @@ -1111,9 +1060,6 @@ our %unified_info = ( "test/buildtest_c_rsa" => { "noinst" => "1" }, - "test/buildtest_c_safestack" => { - "noinst" => "1" - }, "test/buildtest_c_seed" => { "noinst" => "1" }, @@ -1123,15 +1069,9 @@ our %unified_info = ( "test/buildtest_c_sha" => { "noinst" => "1" }, - "test/buildtest_c_srp" => { - "noinst" => "1" - }, "test/buildtest_c_srtp" => { "noinst" => "1" }, - "test/buildtest_c_ssl" => { - "noinst" => "1" - }, "test/buildtest_c_ssl2" => { "noinst" => "1" }, @@ -1159,21 +1099,9 @@ our %unified_info = ( "test/buildtest_c_types" => { "noinst" => "1" }, - "test/buildtest_c_ui" => { - "noinst" => "1" - }, "test/buildtest_c_whrlpool" => { "noinst" => "1" }, - "test/buildtest_c_x509" => { - "noinst" => "1" - }, - "test/buildtest_c_x509_vfy" => { - "noinst" => "1" - }, - "test/buildtest_c_x509v3" => { - "noinst" => "1" - }, "test/casttest" => { "noinst" => "1" }, @@ -7143,22 +7071,10 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_asn1" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_asn1t" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_async" => [ "libcrypto", "libssl" ], - "test/buildtest_c_bio" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_blowfish" => [ "libcrypto", "libssl" @@ -7183,30 +7099,14 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_cmp" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_cmp_util" => [ "libcrypto", "libssl" ], - "test/buildtest_c_cms" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_conf" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_conf_api" => [ "libcrypto", "libssl" ], - "test/buildtest_c_configuration" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_conftypes" => [ "libcrypto", "libssl" @@ -7227,22 +7127,10 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_crmf" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_crypto" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_cryptoerr_legacy" => [ "libcrypto", "libssl" ], - "test/buildtest_c_ct" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_decoder" => [ "libcrypto", "libssl" @@ -7291,10 +7179,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_ess" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_evp" => [ "libcrypto", "libssl" @@ -7303,10 +7187,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_fipskey" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_hmac" => [ "libcrypto", "libssl" @@ -7323,10 +7203,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_lhash" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_macros" => [ "libcrypto", "libssl" @@ -7355,14 +7231,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_ocsp" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_opensslv" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_ossl_typ" => [ "libcrypto", "libssl" @@ -7383,14 +7251,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_pkcs12" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_pkcs7" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_prov_ssl" => [ "libcrypto", "libssl" @@ -7423,10 +7283,6 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_safestack" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_seed" => [ "libcrypto", "libssl" @@ -7439,18 +7295,10 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_srp" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_srtp" => [ "libcrypto", "libssl" ], - "test/buildtest_c_ssl" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_ssl2" => [ "libcrypto", "libssl" @@ -7487,26 +7335,10 @@ our %unified_info = ( "libcrypto", "libssl" ], - "test/buildtest_c_ui" => [ - "libcrypto", - "libssl" - ], "test/buildtest_c_whrlpool" => [ "libcrypto", "libssl" ], - "test/buildtest_c_x509" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_x509_vfy" => [ - "libcrypto", - "libssl" - ], - "test/buildtest_c_x509v3" => [ - "libcrypto", - "libssl" - ], "test/casttest" => [ "libcrypto", "test/libtestutil.a" @@ -9807,10 +9639,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -15883,22 +15715,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "aes" ], - "test/buildtest_asn1.c" => [ - "test/generate_buildtest.pl", - "asn1" - ], - "test/buildtest_asn1t.c" => [ - "test/generate_buildtest.pl", - "asn1t" - ], "test/buildtest_async.c" => [ "test/generate_buildtest.pl", "async" ], - "test/buildtest_bio.c" => [ - "test/generate_buildtest.pl", - "bio" - ], "test/buildtest_blowfish.c" => [ "test/generate_buildtest.pl", "blowfish" @@ -15923,30 +15743,14 @@ our %unified_info = ( "test/generate_buildtest.pl", "cmac" ], - "test/buildtest_cmp.c" => [ - "test/generate_buildtest.pl", - "cmp" - ], "test/buildtest_cmp_util.c" => [ "test/generate_buildtest.pl", "cmp_util" ], - "test/buildtest_cms.c" => [ - "test/generate_buildtest.pl", - "cms" - ], - "test/buildtest_conf.c" => [ - "test/generate_buildtest.pl", - "conf" - ], "test/buildtest_conf_api.c" => [ "test/generate_buildtest.pl", "conf_api" ], - "test/buildtest_configuration.c" => [ - "test/generate_buildtest.pl", - "configuration" - ], "test/buildtest_conftypes.c" => [ "test/generate_buildtest.pl", "conftypes" @@ -15967,22 +15771,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "core_object" ], - "test/buildtest_crmf.c" => [ - "test/generate_buildtest.pl", - "crmf" - ], - "test/buildtest_crypto.c" => [ - "test/generate_buildtest.pl", - "crypto" - ], "test/buildtest_cryptoerr_legacy.c" => [ "test/generate_buildtest.pl", "cryptoerr_legacy" ], - "test/buildtest_ct.c" => [ - "test/generate_buildtest.pl", - "ct" - ], "test/buildtest_decoder.c" => [ "test/generate_buildtest.pl", "decoder" @@ -16031,10 +15823,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "engine" ], - "test/buildtest_ess.c" => [ - "test/generate_buildtest.pl", - "ess" - ], "test/buildtest_evp.c" => [ "test/generate_buildtest.pl", "evp" @@ -16043,10 +15831,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "fips_names" ], - "test/buildtest_fipskey.c" => [ - "test/generate_buildtest.pl", - "fipskey" - ], "test/buildtest_hmac.c" => [ "test/generate_buildtest.pl", "hmac" @@ -16063,10 +15847,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "kdf" ], - "test/buildtest_lhash.c" => [ - "test/generate_buildtest.pl", - "lhash" - ], "test/buildtest_macros.c" => [ "test/generate_buildtest.pl", "macros" @@ -16095,14 +15875,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "objects" ], - "test/buildtest_ocsp.c" => [ - "test/generate_buildtest.pl", - "ocsp" - ], - "test/buildtest_opensslv.c" => [ - "test/generate_buildtest.pl", - "opensslv" - ], "test/buildtest_ossl_typ.c" => [ "test/generate_buildtest.pl", "ossl_typ" @@ -16123,14 +15895,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "pem2" ], - "test/buildtest_pkcs12.c" => [ - "test/generate_buildtest.pl", - "pkcs12" - ], - "test/buildtest_pkcs7.c" => [ - "test/generate_buildtest.pl", - "pkcs7" - ], "test/buildtest_prov_ssl.c" => [ "test/generate_buildtest.pl", "prov_ssl" @@ -16163,10 +15927,6 @@ our %unified_info = ( "test/generate_buildtest.pl", "rsa" ], - "test/buildtest_safestack.c" => [ - "test/generate_buildtest.pl", - "safestack" - ], "test/buildtest_seed.c" => [ "test/generate_buildtest.pl", "seed" @@ -16179,18 +15939,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "sha" ], - "test/buildtest_srp.c" => [ - "test/generate_buildtest.pl", - "srp" - ], "test/buildtest_srtp.c" => [ "test/generate_buildtest.pl", "srtp" ], - "test/buildtest_ssl.c" => [ - "test/generate_buildtest.pl", - "ssl" - ], "test/buildtest_ssl2.c" => [ "test/generate_buildtest.pl", "ssl2" @@ -16227,26 +15979,10 @@ our %unified_info = ( "test/generate_buildtest.pl", "types" ], - "test/buildtest_ui.c" => [ - "test/generate_buildtest.pl", - "ui" - ], "test/buildtest_whrlpool.c" => [ "test/generate_buildtest.pl", "whrlpool" ], - "test/buildtest_x509.c" => [ - "test/generate_buildtest.pl", - "x509" - ], - "test/buildtest_x509_vfy.c" => [ - "test/generate_buildtest.pl", - "x509_vfy" - ], - "test/buildtest_x509v3.c" => [ - "test/generate_buildtest.pl", - "x509v3" - ], "test/p_test.ld" => [ "util/providers.num" ], @@ -18226,18 +17962,9 @@ our %unified_info = ( "test/buildtest_c_aes" => [ "include" ], - "test/buildtest_c_asn1" => [ - "include" - ], - "test/buildtest_c_asn1t" => [ - "include" - ], "test/buildtest_c_async" => [ "include" ], - "test/buildtest_c_bio" => [ - "include" - ], "test/buildtest_c_blowfish" => [ "include" ], @@ -18256,24 +17983,12 @@ our %unified_info = ( "test/buildtest_c_cmac" => [ "include" ], - "test/buildtest_c_cmp" => [ - "include" - ], "test/buildtest_c_cmp_util" => [ "include" ], - "test/buildtest_c_cms" => [ - "include" - ], - "test/buildtest_c_conf" => [ - "include" - ], "test/buildtest_c_conf_api" => [ "include" ], - "test/buildtest_c_configuration" => [ - "include" - ], "test/buildtest_c_conftypes" => [ "include" ], @@ -18289,18 +18004,9 @@ our %unified_info = ( "test/buildtest_c_core_object" => [ "include" ], - "test/buildtest_c_crmf" => [ - "include" - ], - "test/buildtest_c_crypto" => [ - "include" - ], "test/buildtest_c_cryptoerr_legacy" => [ "include" ], - "test/buildtest_c_ct" => [ - "include" - ], "test/buildtest_c_decoder" => [ "include" ], @@ -18337,18 +18043,12 @@ our %unified_info = ( "test/buildtest_c_engine" => [ "include" ], - "test/buildtest_c_ess" => [ - "include" - ], "test/buildtest_c_evp" => [ "include" ], "test/buildtest_c_fips_names" => [ "include" ], - "test/buildtest_c_fipskey" => [ - "include" - ], "test/buildtest_c_hmac" => [ "include" ], @@ -18361,9 +18061,6 @@ our %unified_info = ( "test/buildtest_c_kdf" => [ "include" ], - "test/buildtest_c_lhash" => [ - "include" - ], "test/buildtest_c_macros" => [ "include" ], @@ -18385,12 +18082,6 @@ our %unified_info = ( "test/buildtest_c_objects" => [ "include" ], - "test/buildtest_c_ocsp" => [ - "include" - ], - "test/buildtest_c_opensslv" => [ - "include" - ], "test/buildtest_c_ossl_typ" => [ "include" ], @@ -18406,12 +18097,6 @@ our %unified_info = ( "test/buildtest_c_pem2" => [ "include" ], - "test/buildtest_c_pkcs12" => [ - "include" - ], - "test/buildtest_c_pkcs7" => [ - "include" - ], "test/buildtest_c_prov_ssl" => [ "include" ], @@ -18436,9 +18121,6 @@ our %unified_info = ( "test/buildtest_c_rsa" => [ "include" ], - "test/buildtest_c_safestack" => [ - "include" - ], "test/buildtest_c_seed" => [ "include" ], @@ -18448,15 +18130,9 @@ our %unified_info = ( "test/buildtest_c_sha" => [ "include" ], - "test/buildtest_c_srp" => [ - "include" - ], "test/buildtest_c_srtp" => [ "include" ], - "test/buildtest_c_ssl" => [ - "include" - ], "test/buildtest_c_ssl2" => [ "include" ], @@ -18484,21 +18160,9 @@ our %unified_info = ( "test/buildtest_c_types" => [ "include" ], - "test/buildtest_c_ui" => [ - "include" - ], "test/buildtest_c_whrlpool" => [ "include" ], - "test/buildtest_c_x509" => [ - "include" - ], - "test/buildtest_c_x509_vfy" => [ - "include" - ], - "test/buildtest_c_x509v3" => [ - "include" - ], "test/casttest" => [ "include", "apps/include" @@ -20084,31 +19748,21 @@ our %unified_info = ( "test/bn_internal_test", "test/bntest", "test/buildtest_c_aes", - "test/buildtest_c_asn1", - "test/buildtest_c_asn1t", "test/buildtest_c_async", - "test/buildtest_c_bio", "test/buildtest_c_blowfish", "test/buildtest_c_bn", "test/buildtest_c_buffer", "test/buildtest_c_camellia", "test/buildtest_c_cast", "test/buildtest_c_cmac", - "test/buildtest_c_cmp", "test/buildtest_c_cmp_util", - "test/buildtest_c_cms", - "test/buildtest_c_conf", "test/buildtest_c_conf_api", - "test/buildtest_c_configuration", "test/buildtest_c_conftypes", "test/buildtest_c_core", "test/buildtest_c_core_dispatch", "test/buildtest_c_core_names", "test/buildtest_c_core_object", - "test/buildtest_c_crmf", - "test/buildtest_c_crypto", "test/buildtest_c_cryptoerr_legacy", - "test/buildtest_c_ct", "test/buildtest_c_decoder", "test/buildtest_c_des", "test/buildtest_c_dh", @@ -20121,15 +19775,12 @@ our %unified_info = ( "test/buildtest_c_ecdsa", "test/buildtest_c_encoder", "test/buildtest_c_engine", - "test/buildtest_c_ess", "test/buildtest_c_evp", "test/buildtest_c_fips_names", - "test/buildtest_c_fipskey", "test/buildtest_c_hmac", "test/buildtest_c_http", "test/buildtest_c_idea", "test/buildtest_c_kdf", - "test/buildtest_c_lhash", "test/buildtest_c_macros", "test/buildtest_c_md4", "test/buildtest_c_md5", @@ -20137,15 +19788,11 @@ our %unified_info = ( "test/buildtest_c_modes", "test/buildtest_c_obj_mac", "test/buildtest_c_objects", - "test/buildtest_c_ocsp", - "test/buildtest_c_opensslv", "test/buildtest_c_ossl_typ", "test/buildtest_c_param_build", "test/buildtest_c_params", "test/buildtest_c_pem", "test/buildtest_c_pem2", - "test/buildtest_c_pkcs12", - "test/buildtest_c_pkcs7", "test/buildtest_c_prov_ssl", "test/buildtest_c_provider", "test/buildtest_c_quic", @@ -20154,13 +19801,10 @@ our %unified_info = ( "test/buildtest_c_rc4", "test/buildtest_c_ripemd", "test/buildtest_c_rsa", - "test/buildtest_c_safestack", "test/buildtest_c_seed", "test/buildtest_c_self_test", "test/buildtest_c_sha", - "test/buildtest_c_srp", "test/buildtest_c_srtp", - "test/buildtest_c_ssl", "test/buildtest_c_ssl2", "test/buildtest_c_sslerr_legacy", "test/buildtest_c_stack", @@ -20170,11 +19814,7 @@ our %unified_info = ( "test/buildtest_c_ts", "test/buildtest_c_txt_db", "test/buildtest_c_types", - "test/buildtest_c_ui", "test/buildtest_c_whrlpool", - "test/buildtest_c_x509", - "test/buildtest_c_x509_vfy", - "test/buildtest_c_x509v3", "test/casttest", "test/chacha_internal_test", "test/cipher_overhead_test", @@ -25793,30 +25433,12 @@ our %unified_info = ( "test/buildtest_c_aes-bin-buildtest_aes.o" => [ "test/buildtest_aes.c" ], - "test/buildtest_c_asn1" => [ - "test/buildtest_c_asn1-bin-buildtest_asn1.o" - ], - "test/buildtest_c_asn1-bin-buildtest_asn1.o" => [ - "test/buildtest_asn1.c" - ], - "test/buildtest_c_asn1t" => [ - "test/buildtest_c_asn1t-bin-buildtest_asn1t.o" - ], - "test/buildtest_c_asn1t-bin-buildtest_asn1t.o" => [ - "test/buildtest_asn1t.c" - ], "test/buildtest_c_async" => [ "test/buildtest_c_async-bin-buildtest_async.o" ], "test/buildtest_c_async-bin-buildtest_async.o" => [ "test/buildtest_async.c" ], - "test/buildtest_c_bio" => [ - "test/buildtest_c_bio-bin-buildtest_bio.o" - ], - "test/buildtest_c_bio-bin-buildtest_bio.o" => [ - "test/buildtest_bio.c" - ], "test/buildtest_c_blowfish" => [ "test/buildtest_c_blowfish-bin-buildtest_blowfish.o" ], @@ -25853,42 +25475,18 @@ our %unified_info = ( "test/buildtest_c_cmac-bin-buildtest_cmac.o" => [ "test/buildtest_cmac.c" ], - "test/buildtest_c_cmp" => [ - "test/buildtest_c_cmp-bin-buildtest_cmp.o" - ], - "test/buildtest_c_cmp-bin-buildtest_cmp.o" => [ - "test/buildtest_cmp.c" - ], "test/buildtest_c_cmp_util" => [ "test/buildtest_c_cmp_util-bin-buildtest_cmp_util.o" ], "test/buildtest_c_cmp_util-bin-buildtest_cmp_util.o" => [ "test/buildtest_cmp_util.c" ], - "test/buildtest_c_cms" => [ - "test/buildtest_c_cms-bin-buildtest_cms.o" - ], - "test/buildtest_c_cms-bin-buildtest_cms.o" => [ - "test/buildtest_cms.c" - ], - "test/buildtest_c_conf" => [ - "test/buildtest_c_conf-bin-buildtest_conf.o" - ], - "test/buildtest_c_conf-bin-buildtest_conf.o" => [ - "test/buildtest_conf.c" - ], "test/buildtest_c_conf_api" => [ "test/buildtest_c_conf_api-bin-buildtest_conf_api.o" ], "test/buildtest_c_conf_api-bin-buildtest_conf_api.o" => [ "test/buildtest_conf_api.c" ], - "test/buildtest_c_configuration" => [ - "test/buildtest_c_configuration-bin-buildtest_configuration.o" - ], - "test/buildtest_c_configuration-bin-buildtest_configuration.o" => [ - "test/buildtest_configuration.c" - ], "test/buildtest_c_conftypes" => [ "test/buildtest_c_conftypes-bin-buildtest_conftypes.o" ], @@ -25919,30 +25517,12 @@ our %unified_info = ( "test/buildtest_c_core_object-bin-buildtest_core_object.o" => [ "test/buildtest_core_object.c" ], - "test/buildtest_c_crmf" => [ - "test/buildtest_c_crmf-bin-buildtest_crmf.o" - ], - "test/buildtest_c_crmf-bin-buildtest_crmf.o" => [ - "test/buildtest_crmf.c" - ], - "test/buildtest_c_crypto" => [ - "test/buildtest_c_crypto-bin-buildtest_crypto.o" - ], - "test/buildtest_c_crypto-bin-buildtest_crypto.o" => [ - "test/buildtest_crypto.c" - ], "test/buildtest_c_cryptoerr_legacy" => [ "test/buildtest_c_cryptoerr_legacy-bin-buildtest_cryptoerr_legacy.o" ], "test/buildtest_c_cryptoerr_legacy-bin-buildtest_cryptoerr_legacy.o" => [ "test/buildtest_cryptoerr_legacy.c" ], - "test/buildtest_c_ct" => [ - "test/buildtest_c_ct-bin-buildtest_ct.o" - ], - "test/buildtest_c_ct-bin-buildtest_ct.o" => [ - "test/buildtest_ct.c" - ], "test/buildtest_c_decoder" => [ "test/buildtest_c_decoder-bin-buildtest_decoder.o" ], @@ -26015,12 +25595,6 @@ our %unified_info = ( "test/buildtest_c_engine-bin-buildtest_engine.o" => [ "test/buildtest_engine.c" ], - "test/buildtest_c_ess" => [ - "test/buildtest_c_ess-bin-buildtest_ess.o" - ], - "test/buildtest_c_ess-bin-buildtest_ess.o" => [ - "test/buildtest_ess.c" - ], "test/buildtest_c_evp" => [ "test/buildtest_c_evp-bin-buildtest_evp.o" ], @@ -26033,12 +25607,6 @@ our %unified_info = ( "test/buildtest_c_fips_names-bin-buildtest_fips_names.o" => [ "test/buildtest_fips_names.c" ], - "test/buildtest_c_fipskey" => [ - "test/buildtest_c_fipskey-bin-buildtest_fipskey.o" - ], - "test/buildtest_c_fipskey-bin-buildtest_fipskey.o" => [ - "test/buildtest_fipskey.c" - ], "test/buildtest_c_hmac" => [ "test/buildtest_c_hmac-bin-buildtest_hmac.o" ], @@ -26063,12 +25631,6 @@ our %unified_info = ( "test/buildtest_c_kdf-bin-buildtest_kdf.o" => [ "test/buildtest_kdf.c" ], - "test/buildtest_c_lhash" => [ - "test/buildtest_c_lhash-bin-buildtest_lhash.o" - ], - "test/buildtest_c_lhash-bin-buildtest_lhash.o" => [ - "test/buildtest_lhash.c" - ], "test/buildtest_c_macros" => [ "test/buildtest_c_macros-bin-buildtest_macros.o" ], @@ -26111,18 +25673,6 @@ our %unified_info = ( "test/buildtest_c_objects-bin-buildtest_objects.o" => [ "test/buildtest_objects.c" ], - "test/buildtest_c_ocsp" => [ - "test/buildtest_c_ocsp-bin-buildtest_ocsp.o" - ], - "test/buildtest_c_ocsp-bin-buildtest_ocsp.o" => [ - "test/buildtest_ocsp.c" - ], - "test/buildtest_c_opensslv" => [ - "test/buildtest_c_opensslv-bin-buildtest_opensslv.o" - ], - "test/buildtest_c_opensslv-bin-buildtest_opensslv.o" => [ - "test/buildtest_opensslv.c" - ], "test/buildtest_c_ossl_typ" => [ "test/buildtest_c_ossl_typ-bin-buildtest_ossl_typ.o" ], @@ -26153,18 +25703,6 @@ our %unified_info = ( "test/buildtest_c_pem2-bin-buildtest_pem2.o" => [ "test/buildtest_pem2.c" ], - "test/buildtest_c_pkcs12" => [ - "test/buildtest_c_pkcs12-bin-buildtest_pkcs12.o" - ], - "test/buildtest_c_pkcs12-bin-buildtest_pkcs12.o" => [ - "test/buildtest_pkcs12.c" - ], - "test/buildtest_c_pkcs7" => [ - "test/buildtest_c_pkcs7-bin-buildtest_pkcs7.o" - ], - "test/buildtest_c_pkcs7-bin-buildtest_pkcs7.o" => [ - "test/buildtest_pkcs7.c" - ], "test/buildtest_c_prov_ssl" => [ "test/buildtest_c_prov_ssl-bin-buildtest_prov_ssl.o" ], @@ -26213,12 +25751,6 @@ our %unified_info = ( "test/buildtest_c_rsa-bin-buildtest_rsa.o" => [ "test/buildtest_rsa.c" ], - "test/buildtest_c_safestack" => [ - "test/buildtest_c_safestack-bin-buildtest_safestack.o" - ], - "test/buildtest_c_safestack-bin-buildtest_safestack.o" => [ - "test/buildtest_safestack.c" - ], "test/buildtest_c_seed" => [ "test/buildtest_c_seed-bin-buildtest_seed.o" ], @@ -26237,24 +25769,12 @@ our %unified_info = ( "test/buildtest_c_sha-bin-buildtest_sha.o" => [ "test/buildtest_sha.c" ], - "test/buildtest_c_srp" => [ - "test/buildtest_c_srp-bin-buildtest_srp.o" - ], - "test/buildtest_c_srp-bin-buildtest_srp.o" => [ - "test/buildtest_srp.c" - ], "test/buildtest_c_srtp" => [ "test/buildtest_c_srtp-bin-buildtest_srtp.o" ], "test/buildtest_c_srtp-bin-buildtest_srtp.o" => [ "test/buildtest_srtp.c" ], - "test/buildtest_c_ssl" => [ - "test/buildtest_c_ssl-bin-buildtest_ssl.o" - ], - "test/buildtest_c_ssl-bin-buildtest_ssl.o" => [ - "test/buildtest_ssl.c" - ], "test/buildtest_c_ssl2" => [ "test/buildtest_c_ssl2-bin-buildtest_ssl2.o" ], @@ -26309,36 +25829,12 @@ our %unified_info = ( "test/buildtest_c_types-bin-buildtest_types.o" => [ "test/buildtest_types.c" ], - "test/buildtest_c_ui" => [ - "test/buildtest_c_ui-bin-buildtest_ui.o" - ], - "test/buildtest_c_ui-bin-buildtest_ui.o" => [ - "test/buildtest_ui.c" - ], "test/buildtest_c_whrlpool" => [ "test/buildtest_c_whrlpool-bin-buildtest_whrlpool.o" ], "test/buildtest_c_whrlpool-bin-buildtest_whrlpool.o" => [ "test/buildtest_whrlpool.c" ], - "test/buildtest_c_x509" => [ - "test/buildtest_c_x509-bin-buildtest_x509.o" - ], - "test/buildtest_c_x509-bin-buildtest_x509.o" => [ - "test/buildtest_x509.c" - ], - "test/buildtest_c_x509_vfy" => [ - "test/buildtest_c_x509_vfy-bin-buildtest_x509_vfy.o" - ], - "test/buildtest_c_x509_vfy-bin-buildtest_x509_vfy.o" => [ - "test/buildtest_x509_vfy.c" - ], - "test/buildtest_c_x509v3" => [ - "test/buildtest_c_x509v3-bin-buildtest_x509v3.o" - ], - "test/buildtest_c_x509v3-bin-buildtest_x509v3.o" => [ - "test/buildtest_x509v3.c" - ], "test/casttest" => [ "test/casttest-bin-casttest.o" ], @@ -27543,8 +27039,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27571,7 +27067,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27588,8 +27084,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h index a0b7da3c48b286..0bcf62c3111af0 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-riscv64" -#define DATE "built on: Tue Sep 21 05:58:56 2021 UTC" +#define DATE "built on: Sat Oct 16 04:21:31 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi index b969d3bed26de4..98677318c2df28 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux64-riscv64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-riscv64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-riscv64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux64-riscv64/no-asm/providers/legacy.ld', './config/archs/linux64-riscv64/no-asm/providers/fips.ld', ], @@ -297,7 +298,7 @@ 'openssl_ex_libs_linux64-riscv64': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-riscv64/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-riscv64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -309,7 +310,7 @@ 'defines': ['<@(openssl_defines_linux64-riscv64)'], 'cflags': ['<@(openssl_cflags_linux64-riscv64)'], 'libraries': ['<@(openssl_ex_libs_linux64-riscv64)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-riscv64)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..b75f52d6c5e221 --- /dev/null +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl-legacy.gypi @@ -0,0 +1,72 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-riscv64': [ + + ], + 'openssl_defines_linux64-riscv64': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux64-riscv64': [ + '-Wall -O3', + '-pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-riscv64': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-riscv64/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-riscv64)'], + 'cflags': ['<@(openssl_cflags_linux64-riscv64)'], + 'libraries': ['<@(openssl_ex_libs_linux64-riscv64)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-riscv64)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-riscv64)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi index 40754f6fd9c29c..021debc9963ddd 100644 --- a/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-riscv64': [ './config/archs/linux64-riscv64/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/linux64-riscv64/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-riscv64/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-riscv64/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux64-riscv64/no-asm/providers/legacy.ld', './config/archs/linux64-riscv64/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-riscv64': [ diff --git a/deps/openssl/config/archs/linux64-riscv64/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux64-riscv64/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-riscv64/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index fc31d3c5176154..0cf9b3c8096c99 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7988,6 +7988,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8005,10 +8008,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9711,10 +9711,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27234,8 +27234,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27262,7 +27262,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27279,8 +27279,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 691d8ed9972267..ec72036b32ecfa 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Wed Sep 8 06:11:07 2021 UTC" +#define DATE "built on: Sat Oct 16 04:16:56 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi index 0b47178e1510b8..03023a65d6ddf9 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi @@ -289,8 +289,7 @@ './config/archs/linux64-s390x/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-s390x/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-s390x/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s', - './config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S', + './config/archs/linux64-s390x/asm/providers/legacy.ld', './config/archs/linux64-s390x/asm/providers/fips.ld', ], @@ -323,7 +322,7 @@ 'openssl_ex_libs_linux64-s390x': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-s390x/asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -335,7 +334,7 @@ 'defines': ['<@(openssl_defines_linux64-s390x)'], 'cflags': ['<@(openssl_cflags_linux64-s390x)'], 'libraries': ['<@(openssl_ex_libs_linux64-s390x)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..b331bcff96515b --- /dev/null +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-s390x': [ + + ], + 'openssl_defines_linux64-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux64-s390x': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-s390x': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-s390x)'], + 'cflags': ['<@(openssl_cflags_linux64-s390x)'], + 'libraries': ['<@(openssl_ex_libs_linux64-s390x)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-s390x)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi index a8291e48c562b5..2b8d43f116623a 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl.gypi @@ -919,36 +919,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-s390x': [ './config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S', @@ -970,8 +940,7 @@ './config/archs/linux64-s390x/asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-s390x/asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-s390x/asm/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s', - './config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S', + './config/archs/linux64-s390x/asm/providers/legacy.ld', './config/archs/linux64-s390x/asm/providers/fips.ld', ], 'openssl_defines_linux64-s390x': [ diff --git a/deps/openssl/config/archs/linux64-s390x/asm/providers/legacy.ld b/deps/openssl/config/archs/linux64-s390x/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-s390x/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm index 2fc0e420747599..e883da1c114a99 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -210,7 +210,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -27234,8 +27234,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27262,7 +27262,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27279,8 +27279,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h index 0a29072a7abc04..970028247416fd 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Wed Sep 8 06:11:18 2021 UTC" +#define DATE "built on: Sat Oct 16 04:17:11 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi index 07a4fd449b9e52..35f499962036a7 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi @@ -289,8 +289,7 @@ './config/archs/linux64-s390x/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux64-s390x/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux64-s390x/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-gf2m.s', - './config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S', + './config/archs/linux64-s390x/asm_avx2/providers/legacy.ld', './config/archs/linux64-s390x/asm_avx2/providers/fips.ld', ], @@ -323,7 +322,7 @@ 'openssl_ex_libs_linux64-s390x': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-s390x/asm_avx2/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', @@ -335,7 +334,7 @@ 'defines': ['<@(openssl_defines_linux64-s390x)'], 'cflags': ['<@(openssl_cflags_linux64-s390x)'], 'libraries': ['<@(openssl_ex_libs_linux64-s390x)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..f350e1ece10e82 --- /dev/null +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,75 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-s390x': [ + + ], + 'openssl_defines_linux64-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + ], + 'openssl_cflags_linux64-s390x': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-s390x': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-s390x)'], + 'cflags': ['<@(openssl_cflags_linux64-s390x)'], + 'libraries': ['<@(openssl_ex_libs_linux64-s390x)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-s390x)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi index 0b3fce5d96ddc5..7707ddf5cd9f55 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl.gypi @@ -919,36 +919,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-s390x': [ './config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S', @@ -970,8 +940,7 @@ './config/archs/linux64-s390x/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/linux64-s390x/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/linux64-s390x/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-gf2m.s', - './config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S', + './config/archs/linux64-s390x/asm_avx2/providers/legacy.ld', './config/archs/linux64-s390x/asm_avx2/providers/fips.ld', ], 'openssl_defines_linux64-s390x': [ diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index 82c89c0a05d406..81f74850023944 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -209,7 +209,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7947,9 +7947,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7967,7 +7964,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -27041,8 +27041,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27069,7 +27069,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27086,8 +27086,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index 5587e225bd44a4..e38886c34ba34e 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Wed Sep 8 06:11:29 2021 UTC" +#define DATE "built on: Sat Oct 16 04:17:25 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi index 1999d99b430540..2b28c75fbc00ee 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/linux64-s390x/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-s390x/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-s390x/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux64-s390x/no-asm/providers/legacy.ld', './config/archs/linux64-s390x/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_linux64-s390x': [ '-ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config/../config/archs/linux64-s390x/no-asm/providers/fips.ld' + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_linux64-s390x)'], 'cflags': ['<@(openssl_cflags_linux64-s390x)'], 'libraries': ['<@(openssl_ex_libs_linux64-s390x)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..a9a0eddd2754b7 --- /dev/null +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_linux64-s390x': [ + + ], + 'openssl_defines_linux64-s390x': [ + 'NDEBUG', + 'OPENSSL_USE_NODELETE', + 'B_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_linux64-s390x': [ + '-Wall -O3', + '-pthread -m64', + '-Wall -O3', + ], + 'openssl_ex_libs_linux64-s390x': [ + '-ldl -pthread', + ], + 'version_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/no-asm/providers/legacy.ld' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_linux64-s390x)'], + 'cflags': ['<@(openssl_cflags_linux64-s390x)'], + 'libraries': ['<@(openssl_ex_libs_linux64-s390x)'], + 'ldflags': ['-Wl,--version-script=<@(version_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_linux64-s390x)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_linux64-s390x)'], + }, +} diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi index a81b93c8f9a5c1..2eb79fecae5bca 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/openssl.gypi @@ -924,37 +924,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_linux64-s390x': [ './config/archs/linux64-s390x/no-asm/providers/common/der/der_sm2_gen.c', @@ -964,6 +933,7 @@ './config/archs/linux64-s390x/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/linux64-s390x/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/linux64-s390x/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/linux64-s390x/no-asm/providers/legacy.ld', './config/archs/linux64-s390x/no-asm/providers/fips.ld', ], 'openssl_defines_linux64-s390x': [ diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/providers/legacy.ld b/deps/openssl/config/archs/linux64-s390x/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index 0385eb4af962e6..ec5239b15676e9 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -207,7 +207,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7994,6 +7994,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8011,10 +8014,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9714,10 +9714,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27215,8 +27215,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27243,7 +27243,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27260,8 +27260,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h index 9147756bd03510..ad41d0f1474fb5 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Wed Sep 8 06:12:11 2021 UTC" +#define DATE "built on: Sat Oct 16 04:18:18 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi index 05002edbc7fae1..0549f67c7ea214 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/solaris-x86-gcc/asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris-x86-gcc/asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris-x86-gcc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.s', - './config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.s', - './config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.s', - './config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s', - './config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.s', - './config/archs/solaris-x86-gcc/asm/crypto/des/des-586.s', - './config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.s', + './config/archs/solaris-x86-gcc/asm/providers/legacy.ld', './config/archs/solaris-x86-gcc/asm/providers/fips.ld', ], @@ -338,7 +332,7 @@ 'openssl_ex_libs_solaris-x86-gcc': [ '-lsocket -lnsl -ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -350,7 +344,7 @@ 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], 'cflags': ['<@(openssl_cflags_solaris-x86-gcc)'], 'libraries': ['<@(openssl_ex_libs_solaris-x86-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..4cb849b64e232a --- /dev/null +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-legacy.gypi @@ -0,0 +1,77 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_solaris-x86-gcc': [ + + ], + 'openssl_defines_solaris-x86-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_solaris-x86-gcc': [ + '-Wa,--noexecstack', + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_solaris-x86-gcc': [ + '-lsocket -lnsl -ldl -pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + 'cflags': ['<@(openssl_cflags_solaris-x86-gcc)'], + 'libraries': ['<@(openssl_ex_libs_solaris-x86-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi index 4ca5a1063b66b6..35ef7f31517b75 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_solaris-x86-gcc': [ './config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.s', @@ -972,13 +944,7 @@ './config/archs/solaris-x86-gcc/asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris-x86-gcc/asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris-x86-gcc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/solaris-x86-gcc/asm/crypto/bn/bn-586.s', - './config/archs/solaris-x86-gcc/asm/crypto/bn/co-586.s', - './config/archs/solaris-x86-gcc/asm/crypto/bn/x86-gf2m.s', - './config/archs/solaris-x86-gcc/asm/crypto/bn/x86-mont.s', - './config/archs/solaris-x86-gcc/asm/crypto/des/crypt586.s', - './config/archs/solaris-x86-gcc/asm/crypto/des/des-586.s', - './config/archs/solaris-x86-gcc/asm/crypto/md5/md5-586.s', + './config/archs/solaris-x86-gcc/asm/providers/legacy.ld', './config/archs/solaris-x86-gcc/asm/providers/fips.ld', ], 'openssl_defines_solaris-x86-gcc': [ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/providers/legacy.ld b/deps/openssl/config/archs/solaris-x86-gcc/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm index f1b33abaf6f1dc..e6302af0b4bd11 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm @@ -207,7 +207,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7994,9 +7994,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8014,7 +8011,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9714,10 +9714,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27215,8 +27215,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27243,7 +27243,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27260,8 +27260,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h index 47fc673a790797..6f84d5eb63ab62 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Wed Sep 8 06:12:23 2021 UTC" +#define DATE "built on: Sat Oct 16 04:18:33 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi index 5e2f711502ef62..7a1c1f2d71bc81 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-fips.gypi @@ -298,13 +298,7 @@ './config/archs/solaris-x86-gcc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/solaris-x86-gcc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/solaris-x86-gcc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.s', + './config/archs/solaris-x86-gcc/asm_avx2/providers/legacy.ld', './config/archs/solaris-x86-gcc/asm_avx2/providers/fips.ld', ], @@ -338,7 +332,7 @@ 'openssl_ex_libs_solaris-x86-gcc': [ '-lsocket -lnsl -ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -350,7 +344,7 @@ 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], 'cflags': ['<@(openssl_cflags_solaris-x86-gcc)'], 'libraries': ['<@(openssl_ex_libs_solaris-x86-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..4cb849b64e232a --- /dev/null +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,77 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_solaris-x86-gcc': [ + + ], + 'openssl_defines_solaris-x86-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'DES_ASM', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_PART_WORDS', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_solaris-x86-gcc': [ + '-Wa,--noexecstack', + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_solaris-x86-gcc': [ + '-lsocket -lnsl -ldl -pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + 'cflags': ['<@(openssl_cflags_solaris-x86-gcc)'], + 'libraries': ['<@(openssl_ex_libs_solaris-x86-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi index d36f2e706e5d7a..95c4cdf98fead6 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi @@ -911,34 +911,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_solaris-x86-gcc': [ './config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.s', @@ -972,13 +944,7 @@ './config/archs/solaris-x86-gcc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/solaris-x86-gcc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/solaris-x86-gcc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/bn-586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/co-586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-gf2m.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/bn/x86-mont.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/des/crypt586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/des/des-586.s', - './config/archs/solaris-x86-gcc/asm_avx2/crypto/md5/md5-586.s', + './config/archs/solaris-x86-gcc/asm_avx2/providers/legacy.ld', './config/archs/solaris-x86-gcc/asm_avx2/providers/fips.ld', ], 'openssl_defines_solaris-x86-gcc': [ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index 6c7d1b693fe02c..b0759533f0adeb 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm @@ -206,7 +206,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7938,6 +7938,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7955,10 +7958,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -9632,10 +9632,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ + "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o", - "providers/fips/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ @@ -27032,8 +27032,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27060,7 +27060,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27077,8 +27077,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h index 6a469ab6d6dbdf..a42865d053e3a2 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris-x86-gcc" -#define DATE "built on: Wed Sep 8 06:12:35 2021 UTC" +#define DATE "built on: Sat Oct 16 04:18:48 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi index 440b4c53ff4c30..86af57d946da27 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/solaris-x86-gcc/no-asm/providers/legacy.ld', './config/archs/solaris-x86-gcc/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_solaris-x86-gcc': [ '-lsocket -lnsl -ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], 'cflags': ['<@(openssl_cflags_solaris-x86-gcc)'], 'libraries': ['<@(openssl_ex_libs_solaris-x86-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..76e128f3bd806a --- /dev/null +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_solaris-x86-gcc': [ + + ], + 'openssl_defines_solaris-x86-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_solaris-x86-gcc': [ + '-Wall -O3 -fomit-frame-pointer', + '-pthread', + '-Wall -O3 -fomit-frame-pointer', + ], + 'openssl_ex_libs_solaris-x86-gcc': [ + '-lsocket -lnsl -ldl -pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + 'cflags': ['<@(openssl_cflags_solaris-x86-gcc)'], + 'libraries': ['<@(openssl_ex_libs_solaris-x86-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris-x86-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_solaris-x86-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi index a3ad6c8c8d1c73..04074b294a6ae2 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_solaris-x86-gcc': [ './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris-x86-gcc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/solaris-x86-gcc/no-asm/providers/legacy.ld', './config/archs/solaris-x86-gcc/no-asm/providers/fips.ld', ], 'openssl_defines_solaris-x86-gcc': [ diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/providers/legacy.ld b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index 4649011ef2e276..1dbc5df1f7cbdd 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm @@ -207,7 +207,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7998,6 +7998,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8015,10 +8018,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -27385,8 +27385,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27413,7 +27413,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27430,8 +27430,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h index 7a0f1fb7bfb691..04c752faa1eb47 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Wed Sep 8 06:12:45 2021 UTC" +#define DATE "built on: Sat Oct 16 04:19:01 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi index defd4b97d4ebe0..366b328792ec19 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/solaris64-x86_64-gcc/asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris64-x86_64-gcc/asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris64-x86_64-gcc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx512.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s', + './config/archs/solaris64-x86_64-gcc/asm/providers/legacy.ld', './config/archs/solaris64-x86_64-gcc/asm/providers/fips.ld', ], @@ -352,7 +346,7 @@ 'openssl_ex_libs_solaris64-x86_64-gcc': [ '-lsocket -lnsl -ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -364,7 +358,7 @@ 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], 'cflags': ['<@(openssl_cflags_solaris64-x86_64-gcc)'], 'libraries': ['<@(openssl_ex_libs_solaris64-x86_64-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-legacy.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..137bfd96e216bf --- /dev/null +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-legacy.gypi @@ -0,0 +1,81 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_solaris64-x86_64-gcc': [ + + ], + 'openssl_defines_solaris64-x86_64-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_solaris64-x86_64-gcc': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-m64 -pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_solaris64-x86_64-gcc': [ + '-lsocket -lnsl -ldl -pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + 'cflags': ['<@(openssl_cflags_solaris64-x86_64-gcc)'], + 'libraries': ['<@(openssl_ex_libs_solaris64-x86_64-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi index 66c10bd6071dc7..57074aded0e6a8 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_solaris64-x86_64-gcc': [ './config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s', @@ -990,13 +957,7 @@ './config/archs/solaris64-x86_64-gcc/asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris64-x86_64-gcc/asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris64-x86_64-gcc/asm/providers/common/der/der_wrap_gen.c', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx2.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-avx512.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-gf2m.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s', - './config/archs/solaris64-x86_64-gcc/asm/crypto/md5/md5-x86_64.s', + './config/archs/solaris64-x86_64-gcc/asm/providers/legacy.ld', './config/archs/solaris64-x86_64-gcc/asm/providers/fips.ld', ], 'openssl_defines_solaris64-x86_64-gcc': [ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/providers/legacy.ld b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm index 42eaf80ae15e3a..ba05dd14e597df 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm @@ -207,7 +207,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7998,6 +7998,9 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -8015,10 +8018,7 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o", - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o" + "apps/lib/libtestutil-lib-opt.o" ], "products" => { "bin" => [ @@ -27385,8 +27385,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27413,7 +27413,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27430,8 +27430,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h index f570890717f5fb..9fb9aa667e6ecb 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Wed Sep 8 06:13:01 2021 UTC" +#define DATE "built on: Sat Oct 16 04:19:20 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi index 067fc592c49a5c..602c886f3a3b33 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-fips.gypi @@ -310,13 +310,7 @@ './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/legacy.ld', './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/fips.ld', ], @@ -352,7 +346,7 @@ 'openssl_ex_libs_solaris64-x86_64-gcc': [ '-lsocket -lnsl -ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -364,7 +358,7 @@ 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], 'cflags': ['<@(openssl_cflags_solaris64-x86_64-gcc)'], 'libraries': ['<@(openssl_ex_libs_solaris64-x86_64-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-legacy.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-legacy.gypi new file mode 100644 index 00000000000000..137bfd96e216bf --- /dev/null +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-legacy.gypi @@ -0,0 +1,81 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/asm/x86_64-gcc.c', + 'openssl/crypto/bn/rsaz_exp.c', + 'openssl/crypto/bn/rsaz_exp_x2.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_solaris64-x86_64-gcc': [ + + ], + 'openssl_defines_solaris64-x86_64-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + 'MD5_ASM', + 'OPENSSL_BN_ASM_GF2m', + 'OPENSSL_BN_ASM_MONT', + 'OPENSSL_BN_ASM_MONT5', + 'OPENSSL_IA32_SSE2', + ], + 'openssl_cflags_solaris64-x86_64-gcc': [ + '-Wa,--noexecstack', + '-Wall -O3', + '-m64 -pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_solaris64-x86_64-gcc': [ + '-lsocket -lnsl -ldl -pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + 'cflags': ['<@(openssl_cflags_solaris64-x86_64-gcc)'], + 'libraries': ['<@(openssl_ex_libs_solaris64-x86_64-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi index 6ea83aae640406..ea2b61650eddc4 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi @@ -916,39 +916,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/asm/x86_64-gcc.c', - 'openssl/crypto/bn/rsaz_exp.c', - 'openssl/crypto/bn/rsaz_exp_x2.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_solaris64-x86_64-gcc': [ './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aes-x86_64.s', @@ -990,13 +957,7 @@ './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/der/der_ecx_gen.c', './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/der/der_rsa_gen.c', './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/der/der_wrap_gen.c', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-avx2.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-avx512.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-x86_64.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-gf2m.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont5.s', - './config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/md5/md5-x86_64.s', + './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/legacy.ld', './config/archs/solaris64-x86_64-gcc/asm_avx2/providers/fips.ld', ], 'openssl_defines_solaris64-x86_64-gcc': [ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/providers/legacy.ld b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index 08b253aea3d5ee..8a83f846c77b7e 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm @@ -206,7 +206,7 @@ our %config = ( "patch" => "0", "perl_archname" => "x86_64-linux-thread-multi", "perl_cmd" => "/usr/bin/perl", - "perl_version" => "5.30.3", + "perl_version" => "5.32.1", "perlargv" => [ "no-comp", "no-shared", @@ -7939,9 +7939,6 @@ our %unified_info = ( }, "apps/lib" => { "deps" => [ - "apps/lib/openssl-bin-cmp_mock_srv.o", - "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", - "apps/lib/uitest-bin-apps_ui.o", "apps/lib/libapps-lib-app_libctx.o", "apps/lib/libapps-lib-app_params.o", "apps/lib/libapps-lib-app_provider.o", @@ -7959,7 +7956,10 @@ our %unified_info = ( "apps/lib/libapps-lib-s_cb.o", "apps/lib/libapps-lib-s_socket.o", "apps/lib/libapps-lib-tlssrp_depr.o", - "apps/lib/libtestutil-lib-opt.o" + "apps/lib/libtestutil-lib-opt.o", + "apps/lib/openssl-bin-cmp_mock_srv.o", + "apps/lib/cmp_client_test-bin-cmp_mock_srv.o", + "apps/lib/uitest-bin-apps_ui.o" ], "products" => { "bin" => [ @@ -9633,10 +9633,10 @@ our %unified_info = ( }, "providers/fips" => { "deps" => [ - "providers/fips/fips-dso-fips_entry.o", "providers/fips/libfips-lib-fipsprov.o", "providers/fips/libfips-lib-self_test.o", - "providers/fips/libfips-lib-self_test_kats.o" + "providers/fips/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ @@ -27033,8 +27033,8 @@ unless (caller) { use File::Copy; use Pod::Usage; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; - use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; + use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt'; my $here = dirname($0); @@ -27061,7 +27061,7 @@ unless (caller) { ); use lib '.'; - use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; + use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use gentemplate; print 'Creating ',$buildfile_template,"\n"; @@ -27078,8 +27078,8 @@ unless (caller) { my $prepend = <<'_____'; use File::Spec::Functions; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl'; -use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl'; +use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations'; use lib '.'; use platform; _____ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h index 4b9ddf637e5296..57ec71dacba5c8 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: solaris64-x86_64-gcc" -#define DATE "built on: Wed Sep 8 06:13:17 2021 UTC" +#define DATE "built on: Sat Oct 16 04:19:38 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi index 0fd35527f8e250..b66cf01a83520a 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-fips.gypi @@ -279,6 +279,7 @@ './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/solaris64-x86_64-gcc/no-asm/providers/legacy.ld', './config/archs/solaris64-x86_64-gcc/no-asm/providers/fips.ld', ], @@ -298,7 +299,7 @@ 'openssl_ex_libs_solaris64-x86_64-gcc': [ '-lsocket -lnsl -ldl -pthread', ], - 'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config' + 'version_script': '' }, 'include_dirs': [ '.', @@ -310,7 +311,7 @@ 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], 'cflags': ['<@(openssl_cflags_solaris64-x86_64-gcc)'], 'libraries': ['<@(openssl_ex_libs_solaris64-x86_64-gcc)'], - 'ldflags': ['-Wl,--version-script=<@(linker_script)'], + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], 'direct_dependent_settings': { 'include_dirs': ['./include', '.'], diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-legacy.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-legacy.gypi new file mode 100644 index 00000000000000..4cc11e46f305a7 --- /dev/null +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl-legacy.gypi @@ -0,0 +1,73 @@ +{ + 'variables': { + 'openssl_sources': [ + 'openssl/crypto/bn/bn_asm.c', + 'openssl/crypto/des/des_enc.c', + 'openssl/crypto/des/fcrypt_b.c', + 'openssl/crypto/md5/md5_dgst.c', + 'openssl/crypto/md5/md5_one.c', + 'openssl/crypto/md5/md5_sha1.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish.c', + 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', + 'openssl/providers/implementations/ciphers/cipher_cast5.c', + 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_des.c', + 'openssl/providers/implementations/ciphers/cipher_des_hw.c', + 'openssl/providers/implementations/ciphers/cipher_desx.c', + 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', + 'openssl/providers/implementations/ciphers/cipher_idea.c', + 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc2.c', + 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', + 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', + 'openssl/providers/implementations/ciphers/cipher_seed.c', + 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', + 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', + 'openssl/providers/implementations/digests/md4_prov.c', + 'openssl/providers/implementations/digests/mdc2_prov.c', + 'openssl/providers/implementations/digests/ripemd_prov.c', + 'openssl/providers/implementations/digests/wp_prov.c', + 'openssl/providers/implementations/kdfs/pbkdf1.c', + 'openssl/providers/prov_running.c', + 'openssl/providers/legacyprov.c', + + ], + 'openssl_sources_solaris64-x86_64-gcc': [ + + ], + 'openssl_defines_solaris64-x86_64-gcc': [ + 'NDEBUG', + 'FILIO_H', + 'L_ENDIAN', + 'OPENSSL_BUILDING_OPENSSL', + ], + 'openssl_cflags_solaris64-x86_64-gcc': [ + '-Wall -O3', + '-m64 -pthread', + '-Wall -O3', + ], + 'openssl_ex_libs_solaris64-x86_64-gcc': [ + '-lsocket -lnsl -ldl -pthread', + ], + 'version_script': '' + }, + 'include_dirs': [ + '.', + './include', + './crypto', + './crypto/include/internal', + './providers/common/include', + ], + 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + 'cflags': ['<@(openssl_cflags_solaris64-x86_64-gcc)'], + 'libraries': ['<@(openssl_ex_libs_solaris64-x86_64-gcc)'], + + 'sources': ['<@(openssl_sources)', '<@(openssl_sources_solaris64-x86_64-gcc)'], + 'direct_dependent_settings': { + 'include_dirs': ['./include', '.'], + 'defines': ['<@(openssl_defines_solaris64-x86_64-gcc)'], + }, +} diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi index 212487de3613b1..f25977c6b4bdc8 100644 --- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi @@ -923,37 +923,6 @@ 'openssl/providers/implementations/ciphers/ciphercommon_hw.c', 'openssl/providers/implementations/digests/digestcommon.c', 'openssl/ssl/record/tls_pad.c', - 'openssl/crypto/bn/bn_asm.c', - 'openssl/crypto/des/des_enc.c', - 'openssl/crypto/des/fcrypt_b.c', - 'openssl/crypto/md5/md5_dgst.c', - 'openssl/crypto/md5/md5_one.c', - 'openssl/crypto/md5/md5_sha1.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish.c', - 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', - 'openssl/providers/implementations/ciphers/cipher_cast5.c', - 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_des.c', - 'openssl/providers/implementations/ciphers/cipher_des_hw.c', - 'openssl/providers/implementations/ciphers/cipher_desx.c', - 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', - 'openssl/providers/implementations/ciphers/cipher_idea.c', - 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc2.c', - 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', - 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', - 'openssl/providers/implementations/ciphers/cipher_seed.c', - 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', - 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', - 'openssl/providers/implementations/digests/md4_prov.c', - 'openssl/providers/implementations/digests/mdc2_prov.c', - 'openssl/providers/implementations/digests/ripemd_prov.c', - 'openssl/providers/implementations/digests/wp_prov.c', - 'openssl/providers/implementations/kdfs/pbkdf1.c', - 'openssl/providers/prov_running.c', ], 'openssl_sources_solaris64-x86_64-gcc': [ './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_sm2_gen.c', @@ -963,6 +932,7 @@ './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_ecx_gen.c', './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_rsa_gen.c', './config/archs/solaris64-x86_64-gcc/no-asm/providers/common/der/der_wrap_gen.c', + './config/archs/solaris64-x86_64-gcc/no-asm/providers/legacy.ld', './config/archs/solaris64-x86_64-gcc/no-asm/providers/fips.ld', ], 'openssl_defines_solaris64-x86_64-gcc': [ diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/providers/legacy.ld b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/providers/legacy.ld new file mode 100644 index 00000000000000..1debaaa7ff652d --- /dev/null +++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +};