diff --git a/configure.py b/configure.py index a879a9661d65..77995d09cbad 100755 --- a/configure.py +++ b/configure.py @@ -1980,6 +1980,7 @@ def make_bin_override(): gyp_args = ['--no-parallel', '-Dconfiguring_node=1'] +gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']] if options.use_ninja: gyp_args += ['-f', 'ninja'] diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index f7bc90a9211d..3dce4f5caee7 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -7993,6 +7993,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", @@ -8010,10 +8013,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" => [ 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 716c37fb021b..f20d759f8521 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: Mon Oct 18 06:50:11 2021 UTC" +#define DATE "built on: Tue Oct 19 08:07:57 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/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm index 9c6683bf2181..2a3a61b15134 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -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" => [ 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 c0cfbb8939dd..c802244d9eab 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: Mon Oct 18 06:50:27 2021 UTC" +#define DATE "built on: Tue Oct 19 08:08:13 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/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm index d244b8fee5de..d9981a61a79c 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -7937,6 +7937,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", @@ -7954,10 +7957,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" => [ 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 92e88b315d82..411bd0a5a817 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: Mon Oct 18 06:50:42 2021 UTC" +#define DATE "built on: Tue Oct 19 08:08:28 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/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index e92b783d2685..379465626acf 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -7997,6 +7997,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", @@ -8014,10 +8017,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" => [ 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 4ba74b904824..fb309136cbf5 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: Mon Oct 18 06:50:56 2021 UTC" +#define DATE "built on: Tue Oct 19 08:08:42 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/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index 29d206d6fb05..1b8a3ec4145c 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 @@ -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" => [ 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 ef468396e262..80d39c9124d8 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: Mon Oct 18 06:51:15 2021 UTC" +#define DATE "built on: Tue Oct 19 08:09:01 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/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index e986c78bc160..38141aec66a2 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: Mon Oct 18 06:51:34 2021 UTC" +#define DATE "built on: Tue Oct 19 08:09:20 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index 82ba126df54e..3eadca4fa646 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x560be0d17e50)", + "RANLIB" => "CODE(0x559b0de0c790)", "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" => [ 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 92ca9b9ffb3b..c8f3a08dc8e2 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: Mon Oct 18 07:04:45 2021 UTC" +#define DATE "built on: Tue Oct 19 08:22:31 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/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm index 462227cdd4ca..1821b04de36c 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5625caa48ae0)", + "RANLIB" => "CODE(0x5582b32d0400)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -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" => [ 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 26473bac0f59..aa5345181069 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: Mon Oct 18 07:04:59 2021 UTC" +#define DATE "built on: Tue Oct 19 08:22:45 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/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index cc858300341e..9ee27992263f 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -287,7 +287,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x561d0f2ee970)", + "RANLIB" => "CODE(0x55e3f9508dd0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", 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 bdbecceffdda..ffea7e92b2b3 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: Mon Oct 18 07:05:13 2021 UTC" +#define DATE "built on: Tue Oct 19 08:23:00 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/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index 945544beac66..dd4f9a3d6a97 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 @@ -283,7 +283,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x55a97a668aa0)", + "RANLIB" => "CODE(0x561b8a345980)", "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" => [ 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 242410582799..6e03180c2989 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: Mon Oct 18 07:05:26 2021 UTC" +#define DATE "built on: Tue Oct 19 08:23:12 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index a10f8c89c455..4cc009ff4eb6 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x5606abb4c230)", + "RANLIB" => "CODE(0x55dcfa1252b0)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -8054,9 +8054,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", @@ -8076,7 +8073,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" => [ 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 be3473c371c1..ec06b70e2c31 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: Mon Oct 18 07:03:56 2021 UTC" +#define DATE "built on: Tue Oct 19 08:21:43 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/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm index 6f0c28f19dd1..5e3b2ef60173 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x562647db0980)", + "RANLIB" => "CODE(0x564001d8ca70)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -8054,6 +8054,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", @@ -8073,10 +8076,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" => [ @@ -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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ 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 90814838467f..4003d27cff93 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: Mon Oct 18 07:04:15 2021 UTC" +#define DATE "built on: Tue Oct 19 08:22:01 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/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index 9788c8e0bed2..17d436601223 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -290,7 +290,7 @@ our %target = ( "LDFLAGS" => "/nologo /debug", "MT" => "mt", "MTFLAGS" => "-nologo", - "RANLIB" => "CODE(0x555a19c5b050)", + "RANLIB" => "CODE(0x55fee707fa10)", "RC" => "rc", "_conf_fname_int" => [ "Configurations/00-base-templates.conf", @@ -7995,9 +7995,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-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" => [ @@ -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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ 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 6172fab68f7b..b2555b1424b5 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: Mon Oct 18 07:04:32 2021 UTC" +#define DATE "built on: Tue Oct 19 08:22:19 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index 57cb36a34131..bc3f3fb629d2 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -894,9 +894,18 @@ 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" }, @@ -915,12 +924,24 @@ 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" }, @@ -936,9 +957,18 @@ 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" }, @@ -975,12 +1005,18 @@ 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" }, @@ -993,6 +1029,9 @@ our %unified_info = ( "test/buildtest_c_kdf" => { "noinst" => "1" }, + "test/buildtest_c_lhash" => { + "noinst" => "1" + }, "test/buildtest_c_macros" => { "noinst" => "1" }, @@ -1014,6 +1053,12 @@ 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" }, @@ -1029,6 +1074,12 @@ 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" }, @@ -1053,6 +1104,9 @@ our %unified_info = ( "test/buildtest_c_rsa" => { "noinst" => "1" }, + "test/buildtest_c_safestack" => { + "noinst" => "1" + }, "test/buildtest_c_seed" => { "noinst" => "1" }, @@ -1062,9 +1116,15 @@ 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" }, @@ -1092,9 +1152,21 @@ 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" }, @@ -7093,10 +7165,22 @@ 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" @@ -7121,14 +7205,30 @@ 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" @@ -7149,10 +7249,22 @@ 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" @@ -7201,6 +7313,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_ess" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_evp" => [ "libcrypto", "libssl" @@ -7209,6 +7325,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_fipskey" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_hmac" => [ "libcrypto", "libssl" @@ -7225,6 +7345,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_lhash" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_macros" => [ "libcrypto", "libssl" @@ -7253,6 +7377,14 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_ocsp" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_opensslv" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_ossl_typ" => [ "libcrypto", "libssl" @@ -7273,6 +7405,14 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_pkcs12" => [ + "libcrypto", + "libssl" + ], + "test/buildtest_c_pkcs7" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_prov_ssl" => [ "libcrypto", "libssl" @@ -7305,6 +7445,10 @@ our %unified_info = ( "libcrypto", "libssl" ], + "test/buildtest_c_safestack" => [ + "libcrypto", + "libssl" + ], "test/buildtest_c_seed" => [ "libcrypto", "libssl" @@ -7317,10 +7461,18 @@ 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" @@ -7357,10 +7509,26 @@ 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" @@ -7967,6 +8135,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", @@ -7984,10 +8155,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" => [ @@ -15769,10 +15937,22 @@ 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" @@ -15797,14 +15977,30 @@ 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" @@ -15825,10 +16021,22 @@ 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" @@ -15877,6 +16085,10 @@ 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" @@ -15885,6 +16097,10 @@ 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" @@ -15901,6 +16117,10 @@ 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" @@ -15929,6 +16149,14 @@ 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" @@ -15949,6 +16177,14 @@ 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" @@ -15981,6 +16217,10 @@ 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" @@ -15993,10 +16233,18 @@ 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" @@ -16033,10 +16281,26 @@ 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" ], @@ -18016,9 +18280,18 @@ 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" ], @@ -18037,12 +18310,24 @@ 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" ], @@ -18058,9 +18343,18 @@ 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" ], @@ -18097,12 +18391,18 @@ 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" ], @@ -18115,6 +18415,9 @@ our %unified_info = ( "test/buildtest_c_kdf" => [ "include" ], + "test/buildtest_c_lhash" => [ + "include" + ], "test/buildtest_c_macros" => [ "include" ], @@ -18136,6 +18439,12 @@ our %unified_info = ( "test/buildtest_c_objects" => [ "include" ], + "test/buildtest_c_ocsp" => [ + "include" + ], + "test/buildtest_c_opensslv" => [ + "include" + ], "test/buildtest_c_ossl_typ" => [ "include" ], @@ -18151,6 +18460,12 @@ our %unified_info = ( "test/buildtest_c_pem2" => [ "include" ], + "test/buildtest_c_pkcs12" => [ + "include" + ], + "test/buildtest_c_pkcs7" => [ + "include" + ], "test/buildtest_c_prov_ssl" => [ "include" ], @@ -18175,6 +18490,9 @@ our %unified_info = ( "test/buildtest_c_rsa" => [ "include" ], + "test/buildtest_c_safestack" => [ + "include" + ], "test/buildtest_c_seed" => [ "include" ], @@ -18184,9 +18502,15 @@ 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" ], @@ -18214,9 +18538,21 @@ 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" @@ -19802,21 +20138,31 @@ 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", @@ -19829,12 +20175,15 @@ 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", @@ -19842,11 +20191,15 @@ 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", @@ -19855,10 +20208,13 @@ 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", @@ -19868,7 +20224,11 @@ 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", @@ -25615,12 +25975,30 @@ 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" ], @@ -25657,18 +26035,42 @@ 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" ], @@ -25699,12 +26101,30 @@ 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" ], @@ -25777,6 +26197,12 @@ 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" ], @@ -25789,6 +26215,12 @@ 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" ], @@ -25813,6 +26245,12 @@ 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" ], @@ -25855,6 +26293,18 @@ 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" ], @@ -25885,6 +26335,18 @@ 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" ], @@ -25933,6 +26395,12 @@ 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" ], @@ -25951,12 +26419,24 @@ 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" ], @@ -26011,12 +26491,36 @@ 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" ], 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 9eb0f52990ab..bbb555b276ca 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: Mon Oct 18 06:48:46 2021 UTC" +#define DATE "built on: Tue Oct 19 08:06:31 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/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h index f8ebcd29d73b..881b7d1b1fcc 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: Mon Oct 18 06:49:01 2021 UTC" +#define DATE "built on: Tue Oct 19 08:06:46 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/configdata.pm b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index cbd23ca68457..64a054a6ea71 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -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" => [ 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 d5b64c35b30a..05e66dd7f157 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: Mon Oct 18 06:49:15 2021 UTC" +#define DATE "built on: Tue Oct 19 08:07:00 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/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm index 64c6f2e3a9bd..79e904a76276 100644 --- a/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc-as/asm/configdata.pm @@ -7975,9 +7975,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", @@ -7995,7 +7992,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" => [ @@ -9712,10 +9712,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" => [ 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 6ae0864e6aa1..93a2eb0795b5 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: Mon Oct 18 06:49:28 2021 UTC" +#define DATE "built on: Tue Oct 19 08:07:14 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/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/asm_avx2/configdata.pm index 08348e1ff7d1..b312aec5f39c 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 @@ -9712,10 +9712,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" => [ 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 211a78930506..18ba64b363fe 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: Mon Oct 18 06:49:43 2021 UTC" +#define DATE "built on: Tue Oct 19 08:07:29 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/configdata.pm b/deps/openssl/config/archs/aix64-gcc-as/no-asm/configdata.pm index fbc79b16855b..66d60f578403 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 @@ -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" => [ @@ -9635,10 +9635,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" => [ 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 989832208501..1352b083cc41 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: Mon Oct 18 06:49:58 2021 UTC" +#define DATE "built on: Tue Oct 19 08:07:43 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/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index e9bcc7a952bc..095ea57ea99e 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -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" => [ @@ -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" => [ 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 9254cf797e5e..439f4df0c196 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: Mon Oct 18 06:52:38 2021 UTC" +#define DATE "built on: Tue Oct 19 08:10:24 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/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm index 4a13c4ec1395..b81245e3d6f2 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 @@ -7987,6 +7987,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", @@ -8004,10 +8007,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" => [ @@ -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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ 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 d83a97801bc4..ddc9d0d40941 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: Mon Oct 18 06:52:53 2021 UTC" +#define DATE "built on: Tue Oct 19 08:10:39 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/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 99abb450b841..0cf12a5c60a2 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: Mon Oct 18 06:53:08 2021 UTC" +#define DATE "built on: Tue Oct 19 08:10:55 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/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm index b5963bc0e711..20b7e04a383f 100644 --- a/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-arm64-cc/asm/configdata.pm @@ -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" => [ @@ -9677,10 +9677,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" => [ 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 faf366e76348..b9132fee168d 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: Mon Oct 18 06:53:22 2021 UTC" +#define DATE "built on: Tue Oct 19 08:11:08 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/configdata.pm b/deps/openssl/config/archs/darwin64-arm64-cc/asm_avx2/configdata.pm index ead5dbe48ffc..755d93ea83d8 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 @@ -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" => [ @@ -9677,10 +9677,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" => [ 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 bce7c136cd54..5bd5bf9ffe4d 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: Mon Oct 18 06:53:36 2021 UTC" +#define DATE "built on: Tue Oct 19 08:11:23 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/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h index a2f61ec14995..b5df8c37e9ca 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: Mon Oct 18 06:53:51 2021 UTC" +#define DATE "built on: Tue Oct 19 08:11:37 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/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index 3c8204a85138..d9aaed4cf915 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: Mon Oct 18 06:51:47 2021 UTC" +#define DATE "built on: Tue Oct 19 08:09:34 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/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm index 71e36a66f40c..5fdce86fb14f 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 @@ -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" => [ 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 458137fec0b2..2ef0eff20ecd 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: Mon Oct 18 06:52:06 2021 UTC" +#define DATE "built on: Tue Oct 19 08:09:52 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/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index 5e1277edd5cf..6828bb923ecf 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 @@ -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" => [ 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 40e01a85f302..e4f4195ef87d 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: Mon Oct 18 06:52:25 2021 UTC" +#define DATE "built on: Tue Oct 19 08:10:11 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a 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 afb7b27779c1..859dfa226f79 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: Mon Oct 18 06:54:04 2021 UTC" +#define DATE "built on: Tue Oct 19 08:11:51 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 0aaf0e1a44ef..344017993159 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-aarch64/asm/openssl-fips.gypi @@ -321,7 +321,7 @@ 'openssl_ex_libs_linux-aarch64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-aarch64/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 0f7a9dfa2415..620d53b1e8db 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: Mon Oct 18 06:54:19 2021 UTC" +#define DATE "built on: Tue Oct 19 08:12:06 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 96eb9ab070c6..22670931913e 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 @@ -321,7 +321,7 @@ 'openssl_ex_libs_linux-aarch64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-aarch64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 b08329f0b49c..3660c4cc72dc 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -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" => [ 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 3dd7fcf1d2f9..71e509cd5e3e 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: Mon Oct 18 06:54:34 2021 UTC" +#define DATE "built on: Tue Oct 19 08:12:21 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 f63448b04444..3f8a43dccf7f 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 @@ -298,7 +298,7 @@ 'openssl_ex_libs_linux-aarch64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-aarch64/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-aarch64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index 26c632180356..0126ea6a22b2 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -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" => [ 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 45f87b834221..6c9ee57feaf7 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: Mon Oct 18 06:54:47 2021 UTC" +#define DATE "built on: Tue Oct 19 08:12:34 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 af87417da1d6..f6a3a232dd43 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-armv4/asm/openssl-fips.gypi @@ -326,7 +326,7 @@ 'openssl_ex_libs_linux-armv4': [ '-ldl -pthread -latomic', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-armv4/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 b1dbc3960311..25a1074bb735 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -7984,9 +7984,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", @@ -8004,7 +8001,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" => [ @@ -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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ 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 067eefa6c41f..3f0b5d585ba8 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: Mon Oct 18 06:55:02 2021 UTC" +#define DATE "built on: Tue Oct 19 08:12:49 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 c062600123f1..33e4b8064ae6 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 @@ -326,7 +326,7 @@ 'openssl_ex_libs_linux-armv4': [ '-ldl -pthread -latomic', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-armv4/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 9fecaab83585..23e3efacc5b9 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: Mon Oct 18 06:55:17 2021 UTC" +#define DATE "built on: Tue Oct 19 08:13:04 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 589ea11c51eb..1c35efba7565 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 @@ -298,7 +298,7 @@ 'openssl_ex_libs_linux-armv4': [ '-ldl -pthread -latomic', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-armv4/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-armv4/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index 114a96f7f5d3..99934eed46cd 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -9721,10 +9721,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" => [ 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 a9cd157769bf..0ee44d03d8ce 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: Mon Oct 18 06:55:30 2021 UTC" +#define DATE "built on: Tue Oct 19 08:13:18 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 a2713db50e07..7363f699a810 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-fips.gypi @@ -339,7 +339,7 @@ 'openssl_ex_libs_linux-elf': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-elf/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 b97192cf8a81..5c52076f6da2 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: Mon Oct 18 06:55:46 2021 UTC" +#define DATE "built on: Tue Oct 19 08:13:33 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 1520c49d4692..05c2edf835f5 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 @@ -339,7 +339,7 @@ 'openssl_ex_libs_linux-elf': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-elf/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 14a79f3946bd..e566a4a24f69 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -7945,6 +7945,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", @@ -7962,10 +7965,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" => [ 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 903e922993a0..8df1fc627a0d 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: Mon Oct 18 06:56:01 2021 UTC" +#define DATE "built on: Tue Oct 19 08:13:49 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 75444e3b472c..b82762a2a4e6 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux-elf': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-elf/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-elf/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm index 2e7d7f1f3770..7b35393d1d5d 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm @@ -7974,9 +7974,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", @@ -7994,7 +7991,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" => [ @@ -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" => [ 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 19212649fc65..c098728842d3 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: Mon Oct 18 06:57:57 2021 UTC" +#define DATE "built on: Tue Oct 19 08:15:46 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 5ddb3a3bbee6..e50eae62690c 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc/asm/openssl-fips.gypi @@ -325,7 +325,7 @@ 'openssl_ex_libs_linux-ppc': [ '-ldl -pthread -latomic', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 d1a9fea8be3c..597548e597cc 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm @@ -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" => [ 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 e5b96e0616d4..8a1bc19cd1e7 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: Mon Oct 18 06:58:12 2021 UTC" +#define DATE "built on: Tue Oct 19 08:16:01 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 ce844e3084c6..8eba5700c377 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 @@ -325,7 +325,7 @@ 'openssl_ex_libs_linux-ppc': [ '-ldl -pthread -latomic', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 3e3c28bf00bb..35171875558c 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: Mon Oct 18 06:58:26 2021 UTC" +#define DATE "built on: Tue Oct 19 08:16:16 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 9b8de7c1206e..6c6ffeafd118 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux-ppc': [ '-ldl -pthread -latomic', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 3615c3dd9816..947918fb3e42 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: Mon Oct 18 06:58:40 2021 UTC" +#define DATE "built on: Tue Oct 19 08:16:29 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 aa3cb4472f6c..ef238a561475 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64/asm/openssl-fips.gypi @@ -334,7 +334,7 @@ 'openssl_ex_libs_linux-ppc64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 46e981288274..6939c3338a32 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm @@ -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" => [ 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 2f0bf47a419b..093a1cf86185 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: Mon Oct 18 06:58:55 2021 UTC" +#define DATE "built on: Tue Oct 19 08:16:45 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 90de40d5d80c..920a46cf9d41 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 @@ -334,7 +334,7 @@ 'openssl_ex_libs_linux-ppc64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 c02a4bad9444..c40fec799ae5 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm @@ -7947,6 +7947,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", @@ -7964,10 +7967,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" => [ 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 eabee5310a79..316cd6f2f09b 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: Mon Oct 18 06:59:10 2021 UTC" +#define DATE "built on: Tue Oct 19 08:17:00 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 e7f2d2904739..493fe33c6a26 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux-ppc64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index 328c9b2a99c6..70e0325009ef 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -9717,10 +9717,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" => [ 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 8b6bc879a840..c32b06918127 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: Mon Oct 18 06:59:24 2021 UTC" +#define DATE "built on: Tue Oct 19 08:17:14 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 6be39078aa11..d581f383b76e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-ppc64le/asm/openssl-fips.gypi @@ -334,7 +334,7 @@ 'openssl_ex_libs_linux-ppc64le': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64le/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 60eba54caca9..f8159475d821 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -9717,10 +9717,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" => [ 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 0270589a9b36..ea316046d6cf 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: Mon Oct 18 06:59:40 2021 UTC" +#define DATE "built on: Tue Oct 19 08:17:29 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 a413a12ef1dc..44ff484c4080 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 @@ -334,7 +334,7 @@ 'openssl_ex_libs_linux-ppc64le': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64le/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 5be654afb166..50e108ebb81b 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: Mon Oct 18 06:59:55 2021 UTC" +#define DATE "built on: Tue Oct 19 08:17:44 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 a5deaadff2c1..8e3fcb8b75a4 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux-ppc64le': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-ppc64le/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-ppc64le/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux-x32/asm/configdata.pm b/deps/openssl/config/archs/linux-x32/asm/configdata.pm index 3f52ca06143b..59e3a53fe400 100644 --- a/deps/openssl/config/archs/linux-x32/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/asm/configdata.pm @@ -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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ 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 2016a5259d26..522c31464992 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: Mon Oct 18 06:56:14 2021 UTC" +#define DATE "built on: Tue Oct 19 08:14:02 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 397887c8d8f6..cd6b53ab223b 100644 --- a/deps/openssl/config/archs/linux-x32/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux-x32/asm/openssl-fips.gypi @@ -353,7 +353,7 @@ 'openssl_ex_libs_linux-x32': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x32/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 a1469001c3da..8225fa27f3a9 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm @@ -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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ 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 3f0fd3c086dc..227bb77c59be 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: Mon Oct 18 06:56:34 2021 UTC" +#define DATE "built on: Tue Oct 19 08:14:22 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 ffa10dd4a582..6567ab9feaff 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 @@ -353,7 +353,7 @@ 'openssl_ex_libs_linux-x32': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x32/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 8002c7a3ad3b..2ce36e5fe3bb 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm @@ -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" => [ 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 ecaa6fd63c3d..031aedd8aa66 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: Mon Oct 18 06:56:52 2021 UTC" +#define DATE "built on: Tue Oct 19 08:14:41 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 a0e3b1c1c192..802eed05e74b 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux-x32': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-x32/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x32/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 65331c936576..ddaf9474dd35 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -8006,9 +8006,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", @@ -8026,7 +8023,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" => [ @@ -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" => [ 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 a5c3ace68866..ab5786a9440d 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: Mon Oct 18 06:57:06 2021 UTC" +#define DATE "built on: Tue Oct 19 08:14: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/asm/openssl-fips.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-fips.gypi index c00bea47a89e..90222424c608 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 @@ -353,7 +353,7 @@ 'openssl_ex_libs_linux-x86_64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x86_64/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 88238295a2dc..22c6d3abad7b 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 @@ -8006,9 +8006,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", @@ -8026,7 +8023,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" => [ @@ -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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ 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 11b9fa2fdea4..86e53e9a5f51 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: Mon Oct 18 06:57:25 2021 UTC" +#define DATE "built on: Tue Oct 19 08:15:14 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 28b3f7720cbd..a2c4692e33af 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 @@ -353,7 +353,7 @@ 'openssl_ex_libs_linux-x86_64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x86_64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 2cc632914bad..80d996c55154 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 @@ -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" => [ 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 4868980dfa45..c66d4daa7a6b 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: Mon Oct 18 06:57:44 2021 UTC" +#define DATE "built on: Tue Oct 19 08:15:33 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 54db4aeef05a..c7b6bbbec688 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux-x86_64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux-x86_64/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux-x86_64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index ca048ac3ac00..2e50808dc960 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -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" => [ 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 8f049848322e..68f884498fc8 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: Mon Oct 18 07:00:09 2021 UTC" +#define DATE "built on: Tue Oct 19 08:17:57 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 6f8468fdef4b..6ddef904eed7 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl-fips.gypi @@ -325,7 +325,7 @@ 'openssl_ex_libs_linux32-s390x': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux32-s390x/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 7ab20f979cba..23323406e59d 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: Mon Oct 18 07:00:24 2021 UTC" +#define DATE "built on: Tue Oct 19 08:18:12 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 b4d49ee4d986..387e02cdbf00 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 @@ -325,7 +325,7 @@ 'openssl_ex_libs_linux32-s390x': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux32-s390x/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 0dfb7497b266..2fc3fe01abd2 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -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" => [ @@ -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" => [ 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 9abde0937c3f..8bbaacb5bc00 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: Mon Oct 18 07:00:39 2021 UTC" +#define DATE "built on: Tue Oct 19 08:18:27 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 7a5bb7ededc2..63cfc208b50d 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux32-s390x': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux32-s390x/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux32-s390x/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index a67660a6fcc0..7267351c8b9a 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -7968,6 +7968,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", @@ -7985,10 +7988,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" => [ 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 8ac7bf45bf20..d9bd2341123f 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: Mon Oct 18 07:01:37 2021 UTC" +#define DATE "built on: Tue Oct 19 08:19:24 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 654b5c5bbd60..541f39c03540 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-mips64/asm/openssl-fips.gypi @@ -311,7 +311,7 @@ 'openssl_ex_libs_linux64-mips64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-mips64/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 00ca7cc28a2f..422373fa2d29 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -7968,9 +7968,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", @@ -7988,7 +7985,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" => [ @@ -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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ 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 73d8de078e3b..72de851aa46d 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: Mon Oct 18 07:01:51 2021 UTC" +#define DATE "built on: Tue Oct 19 08:19: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_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-mips64/asm_avx2/openssl-fips.gypi index 9c84d01c306a..23e497a162a5 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 @@ -311,7 +311,7 @@ 'openssl_ex_libs_linux64-mips64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-mips64/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 2227df57d07a..317f39afb055 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -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" => [ 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 59fae591869d..e186a0057eca 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: Mon Oct 18 07:02:05 2021 UTC" +#define DATE "built on: Tue Oct 19 08:19:52 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 ee9f016f3ba6..a6178f1c65a5 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 @@ -298,7 +298,7 @@ 'openssl_ex_libs_linux64-mips64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-mips64/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-mips64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 2eee5d5e1ce0..a2ddedf93089 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: Mon Oct 18 07:05:38 2021 UTC" +#define DATE "built on: Tue Oct 19 08:23:24 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 d546f0dbd41e..0d7994f5f4ac 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 @@ -298,7 +298,7 @@ 'openssl_ex_libs_linux64-riscv64': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-riscv64/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-riscv64/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index 0cf9b3c8096c..5f2de6585931 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -7988,9 +7988,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", @@ -8008,7 +8005,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" => [ @@ -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/libfips-lib-self_test_kats.o", + "providers/fips/fips-dso-fips_entry.o" ], "products" => { "dso" => [ 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 8b7be28e45c8..2e64cc4b9382 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: Mon Oct 18 07:00:52 2021 UTC" +#define DATE "built on: Tue Oct 19 08:18:41 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 c57337c43bac..2b3484256866 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi +++ b/deps/openssl/config/archs/linux64-s390x/asm/openssl-fips.gypi @@ -324,7 +324,7 @@ 'openssl_ex_libs_linux64-s390x': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-s390x/asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 cb6edf1b9169..e883da1c114a 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -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" => [ 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 088aed0603df..5b40245af567 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: Mon Oct 18 07:01:08 2021 UTC" +#define DATE "built on: Tue Oct 19 08:18: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_avx2/openssl-fips.gypi b/deps/openssl/config/archs/linux64-s390x/asm_avx2/openssl-fips.gypi index 1d9aec345f28..7277573a2500 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 @@ -324,7 +324,7 @@ 'openssl_ex_libs_linux64-s390x': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-s390x/asm_avx2/providers/fips.ld' }, 'include_dirs': [ '.', 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 909482e0e233..30832b72b371 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: Mon Oct 18 07:01:23 2021 UTC" +#define DATE "built on: Tue Oct 19 08:19:10 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 a0fed7cdbeac..0456b3edfab1 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 @@ -299,7 +299,7 @@ 'openssl_ex_libs_linux64-s390x': [ '-ldl -pthread', ], - 'linker_script': '$(srcdir)/deps/openssl/config/archs/linux64-s390x/no-asm/providers/fips.ld' + 'linker_script': '<(PRODUCT_DIR)/../../deps/openssl/config/archs/linux64-s390x/no-asm/providers/fips.ld' }, 'include_dirs': [ '.', 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 f1f3d3030f44..0760aca16aec 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: Mon Oct 18 07:02:19 2021 UTC" +#define DATE "built on: Tue Oct 19 08:20:06 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/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm index 4696019ae9e9..29be3c1b8385 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 @@ -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" => [ 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 db3ccc85ed2c..e3f38f11fded 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: Mon Oct 18 07:02:35 2021 UTC" +#define DATE "built on: Tue Oct 19 08:20:21 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/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm index b0759533f0ad..bf81aa9ee49b 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 @@ -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" => [ 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 cbf9e4c5dd08..5956d6db1ddd 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: Mon Oct 18 07:02:50 2021 UTC" +#define DATE "built on: Tue Oct 19 08:20:37 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/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm index 1dbc5df1f7cb..db68aec37579 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 @@ -7998,9 +7998,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", @@ -8018,7 +8015,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" => [ 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 f4eda609a381..5d8d5f998037 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: Mon Oct 18 07:03:04 2021 UTC" +#define DATE "built on: Tue Oct 19 08:20:50 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/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm index 41cfebe2dfa7..7bd5ff0f8e2f 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 @@ -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" => [ @@ -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/fips-dso-fips_entry.o" + "providers/fips/libfips-lib-self_test_kats.o" ], "products" => { "dso" => [ 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 922f9e60f1ef..3e911199f8d3 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: Mon Oct 18 07:03:23 2021 UTC" +#define DATE "built on: Tue Oct 19 08:21:10 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/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm index 8a83f846c77b..b1b396dd70f1 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 @@ -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" => [ 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 de057e1ea2c2..83f8d7046a6f 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: Mon Oct 18 07:03:42 2021 UTC" +#define DATE "built on: Tue Oct 19 08:21:28 2021 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl index 2f5f6d1f2faa..707081a5fe70 100755 --- a/deps/openssl/config/generate_gypi.pl +++ b/deps/openssl/config/generate_gypi.pl @@ -100,7 +100,7 @@ copy("$src_dir/providers/common/include/prov/der_digests.h", "$base_dir/providers/common/include/prov/") or die "Copy failed: $!"; -my $linker_script_dir = "\$(srcdir)/deps/openssl/config/archs/$arch/$asm/providers"; +my $linker_script_dir = "<(PRODUCT_DIR)/../../deps/openssl/config/archs/$arch/$asm/providers"; my $fips_linker_script = ""; if ($fips_ld ne "") { $fips_linker_script = "$linker_script_dir/fips.ld"; diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index beb9194166ec..7b1278044e7a 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -7,14 +7,21 @@ 'conditions': [ ['OS == "win"', { 'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj', + 'openssl_dir': '<(PRODUCT_DIR_ABS)/obj/lib', }], ['GENERATOR == "ninja"', { 'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj', + 'modules_dir': '<(PRODUCT_DIR_ABS)/obj/lib/openssl-modules', + 'openssl_dir': '<(PRODUCT_DIR_ABS)/obj/lib', }, { 'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target', + 'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules', + 'openssl_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl', }], ['OS=="mac"', { 'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target', + 'modules_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl/lib/openssl-modules', + 'openssl_dir': '<(PRODUCT_DIR_ABS)/obj.target/deps/openssl', }], ], }, @@ -49,8 +56,8 @@ }], ['node_shared_openssl=="false"', { 'defines': [ - 'MODULESDIR="<(obj_dir_abs)/deps/openssl/lib/openssl-modules"', - 'OPENSSLDIR="<(obj_dir_abs)/deps/openssl"', + 'MODULESDIR="<(modules_dir)"', + 'OPENSSLDIR="<(openssl_dir)"', ] }], ], diff --git a/deps/openssl/openssl.gypi b/deps/openssl/openssl.gypi index af08a33c9c44..f590067c8d09 100644 --- a/deps/openssl/openssl.gypi +++ b/deps/openssl/openssl.gypi @@ -1292,13 +1292,11 @@ # Set to ubuntu default path for convenience. If necessary, # override this at runtime with the SSL_CERT_DIR environment # variable. - 'OPENSSLDIR="/System/Library/OpenSSL/"', ], 'openssl_default_defines_linux_others': [ # Set to ubuntu default path for convenience. If necessary, # override this at runtime with the SSL_CERT_DIR environment # variable. - 'OPENSSLDIR="/etc/ssl"', ] } } diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi index dbd35ce75d4f..3dedc5065bf4 100644 --- a/deps/openssl/openssl_common.gypi +++ b/deps/openssl/openssl_common.gypi @@ -49,7 +49,6 @@ 'WARNING_CFLAGS': ['-Wno-missing-field-initializers'] }, 'defines': [ - 'OPENSSLDIR="/System/Library/OpenSSL/"', 'ENGINESDIR="/dev/null"', ], }, 'OS=="solaris"', { @@ -62,7 +61,6 @@ # linux and others 'cflags': ['-Wno-missing-field-initializers',], 'defines': [ - 'OPENSSLDIR="<(obj_dir_abs)/deps/openssl"', 'ENGINESDIR="/dev/null"', 'TERMIOS', ], diff --git a/node.gyp b/node.gyp index 39496fd05077..989efb1aa5f9 100644 --- a/node.gyp +++ b/node.gyp @@ -347,15 +347,21 @@ 'variables': { 'openssl-cli': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)openssl-cli<(EXECUTABLE_SUFFIX)', 'provider_name': 'libopenssl-fipsmodule', - 'fipsmodule_internal': '<(obj_dir)/deps/openssl/<(provider_name).so', - 'fipsmodule': '<(obj_dir)/deps/openssl/lib/openssl-modules/fips.so', - 'fipsconfig': '<(obj_dir)/deps/openssl/fipsmodule.cnf', - 'opensslconfig_internal': '<(obj_dir)/deps/openssl/openssl.cnf', 'opensslconfig': './deps/openssl/openssl/apps/openssl.cnf', + 'conditions': [ + ['GENERATOR == "ninja"', { + 'fipsmodule_internal': '<(PRODUCT_DIR)/lib/<(provider_name).so', + 'fipsmodule': '<(PRODUCT_DIR)/obj/lib/openssl-modules/fips.so', + 'fipsconfig': '<(PRODUCT_DIR)/obj/lib/fipsmodule.cnf', + 'opensslconfig_internal': '<(PRODUCT_DIR)/obj/lib/openssl.cnf', + }, { + 'fipsmodule_internal': '<(PRODUCT_DIR)/obj.target/deps/openssl/<(provider_name).so', + 'fipsmodule': '<(PRODUCT_DIR)/obj.target/deps/openssl/lib/openssl-modules/fips.so', + 'fipsconfig': '<(PRODUCT_DIR)/obj/deps/openssl/fipsmodule.cnf', + 'opensslconfig_internal': '<(PRODUCT_DIR)/obj.target/deps/openssl/openssl.cnf', + }], + ], }, - #'dependencies': [ - #'./deps/openssl/openssl.gyp:openssl-fipsmodule' - #], 'actions': [ { 'action_name': 'fipsinstall', diff --git a/tools/gyp/pylib/gyp/__init__.py b/tools/gyp/pylib/gyp/__init__.py index b1cc704dfdc6..f44859d1b005 100755 --- a/tools/gyp/pylib/gyp/__init__.py +++ b/tools/gyp/pylib/gyp/__init__.py @@ -104,8 +104,12 @@ def Load( default_variables.setdefault(key, val) output_dir = params["options"].generator_output or params["options"].toplevel_dir - default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir, - default_variables['CONFIGURATION_NAME'])) + if (default_variables['GENERATOR'] == 'ninja'): + default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir, + 'out', default_variables['build_type'])) + else: + default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir, + default_variables['build_type'])) # Give the generator the opportunity to set additional variables based on # the params it will receive in the output phase.