Skip to content

Commit d434c53

Browse files
danbevdanbev
committed
deps: regenerate OpenSSL arch files
Co-authored-by: Richard Lau <[email protected]> PR-URL: #40478 Refs: #40455 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
1 parent 2cebd5f commit d434c53

File tree

324 files changed

+1195
-1277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+1195
-1277
lines changed

‎deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ our %config = (
206206
"patch" => "0",
207207
"perl_archname" => "x86_64-linux-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209-
"perl_version" => "5.30.3",
209+
"perl_version" => "5.32.1",
210210
"perlargv" => [
211211
"no-comp",
212212
"no-shared",
@@ -27216,8 +27216,8 @@ unless (caller) {
2721627216
use File::Copy;
2721727217
use Pod::Usage;
2721827218

27219-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
27220-
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
27219+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27220+
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
2722127221

2722227222
my $here = dirname($0);
2722327223

@@ -27244,7 +27244,7 @@ unless (caller) {
2724427244
);
2724527245

2724627246
use lib '.';
27247-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
27247+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
2724827248
use gentemplate;
2724927249

2725027250
print 'Creating ',$buildfile_template,"\n";
@@ -27261,8 +27261,8 @@ unless (caller) {
2726127261

2726227262
my $prepend = <<'_____';
2726327263
use File::Spec::Functions;
27264-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
27265-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
27264+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27265+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
2726627266
use lib '.';
2726727267
use platform;
2726827268
_____

‎deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Wed Sep 8 06:02:47 2021 UTC"
14+
#define DATE "built on: Mon Oct 18 06:50:11 2021 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86/asm/openssl-fips.gypi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@
305305
'./config/archs/BSD-x86/asm/crypto/des/crypt586.s',
306306
'./config/archs/BSD-x86/asm/crypto/des/des-586.s',
307307
'./config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
308+
'./config/archs/BSD-x86/asm/providers/legacy.ld',
308309
'./config/archs/BSD-x86/asm/providers/fips.ld',
309310

310311
],
@@ -337,7 +338,7 @@
337338
'openssl_ex_libs_BSD-x86': [
338339
'-pthread',
339340
],
340-
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
341+
'linker_script': ''
341342
},
342343
'include_dirs': [
343344
'.',
@@ -349,7 +350,7 @@
349350
'defines': ['<@(openssl_defines_BSD-x86)'],
350351
'cflags': ['<@(openssl_cflags_BSD-x86)'],
351352
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
352-
'ldflags': ['-Wl,--version-script=<@(linker_script)'],
353+
353354
'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
354355
'direct_dependent_settings': {
355356
'include_dirs': ['./include', '.'],

‎deps/openssl/config/archs/BSD-x86/asm/openssl.gypi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,7 @@
940940
'openssl/providers/implementations/digests/wp_prov.c',
941941
'openssl/providers/implementations/kdfs/pbkdf1.c',
942942
'openssl/providers/prov_running.c',
943+
'openssl/providers/legacyprov.c',
943944
],
944945
'openssl_sources_BSD-x86': [
945946
'./config/archs/BSD-x86/asm/crypto/aes/aes-586.s',
@@ -980,6 +981,7 @@
980981
'./config/archs/BSD-x86/asm/crypto/des/crypt586.s',
981982
'./config/archs/BSD-x86/asm/crypto/des/des-586.s',
982983
'./config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
984+
'./config/archs/BSD-x86/asm/providers/legacy.ld',
983985
'./config/archs/BSD-x86/asm/providers/fips.ld',
984986
],
985987
'openssl_defines_BSD-x86': [

‎deps/openssl/config/archs/BSD-x86/asm/providers/legacy.ld

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
global:
3+
OSSL_provider_init;
4+
local: *;
5+
};

‎deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ our %config = (
206206
"patch" => "0",
207207
"perl_archname" => "x86_64-linux-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209-
"perl_version" => "5.30.3",
209+
"perl_version" => "5.32.1",
210210
"perlargv" => [
211211
"no-comp",
212212
"no-shared",
@@ -9714,10 +9714,10 @@ our %unified_info = (
97149714
},
97159715
"providers/fips" => {
97169716
"deps" => [
9717-
"providers/fips/fips-dso-fips_entry.o",
97189717
"providers/fips/libfips-lib-fipsprov.o",
97199718
"providers/fips/libfips-lib-self_test.o",
9720-
"providers/fips/libfips-lib-self_test_kats.o"
9719+
"providers/fips/libfips-lib-self_test_kats.o",
9720+
"providers/fips/fips-dso-fips_entry.o"
97219721
],
97229722
"products" => {
97239723
"dso" => [
@@ -27216,8 +27216,8 @@ unless (caller) {
2721627216
use File::Copy;
2721727217
use Pod::Usage;
2721827218

27219-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
27220-
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
27219+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27220+
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
2722127221

2722227222
my $here = dirname($0);
2722327223

@@ -27244,7 +27244,7 @@ unless (caller) {
2724427244
);
2724527245

2724627246
use lib '.';
27247-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
27247+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
2724827248
use gentemplate;
2724927249

2725027250
print 'Creating ',$buildfile_template,"\n";
@@ -27261,8 +27261,8 @@ unless (caller) {
2726127261

2726227262
my $prepend = <<'_____';
2726327263
use File::Spec::Functions;
27264-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
27265-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
27264+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27265+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
2726627266
use lib '.';
2726727267
use platform;
2726827268
_____

‎deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Wed Sep 8 06:02:59 2021 UTC"
14+
#define DATE "built on: Mon Oct 18 06:50:27 2021 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-fips.gypi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@
305305
'./config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
306306
'./config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
307307
'./config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
308+
'./config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
308309
'./config/archs/BSD-x86/asm_avx2/providers/fips.ld',
309310

310311
],
@@ -337,7 +338,7 @@
337338
'openssl_ex_libs_BSD-x86': [
338339
'-pthread',
339340
],
340-
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
341+
'linker_script': ''
341342
},
342343
'include_dirs': [
343344
'.',
@@ -349,7 +350,7 @@
349350
'defines': ['<@(openssl_defines_BSD-x86)'],
350351
'cflags': ['<@(openssl_cflags_BSD-x86)'],
351352
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
352-
'ldflags': ['-Wl,--version-script=<@(linker_script)'],
353+
353354
'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
354355
'direct_dependent_settings': {
355356
'include_dirs': ['./include', '.'],

‎deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,7 @@
940940
'openssl/providers/implementations/digests/wp_prov.c',
941941
'openssl/providers/implementations/kdfs/pbkdf1.c',
942942
'openssl/providers/prov_running.c',
943+
'openssl/providers/legacyprov.c',
943944
],
944945
'openssl_sources_BSD-x86': [
945946
'./config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s',
@@ -980,6 +981,7 @@
980981
'./config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
981982
'./config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
982983
'./config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
984+
'./config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
983985
'./config/archs/BSD-x86/asm_avx2/providers/fips.ld',
984986
],
985987
'openssl_defines_BSD-x86': [

‎deps/openssl/config/archs/BSD-x86/asm_avx2/providers/legacy.ld

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
global:
3+
OSSL_provider_init;
4+
local: *;
5+
};

‎deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ our %config = (
205205
"patch" => "0",
206206
"perl_archname" => "x86_64-linux-thread-multi",
207207
"perl_cmd" => "/usr/bin/perl",
208-
"perl_version" => "5.30.3",
208+
"perl_version" => "5.32.1",
209209
"perlargv" => [
210210
"no-comp",
211211
"no-shared",
@@ -7937,9 +7937,6 @@ our %unified_info = (
79377937
},
79387938
"apps/lib" => {
79397939
"deps" => [
7940-
"apps/lib/openssl-bin-cmp_mock_srv.o",
7941-
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
7942-
"apps/lib/uitest-bin-apps_ui.o",
79437940
"apps/lib/libapps-lib-app_libctx.o",
79447941
"apps/lib/libapps-lib-app_params.o",
79457942
"apps/lib/libapps-lib-app_provider.o",
@@ -7957,7 +7954,10 @@ our %unified_info = (
79577954
"apps/lib/libapps-lib-s_cb.o",
79587955
"apps/lib/libapps-lib-s_socket.o",
79597956
"apps/lib/libapps-lib-tlssrp_depr.o",
7960-
"apps/lib/libtestutil-lib-opt.o"
7957+
"apps/lib/libtestutil-lib-opt.o",
7958+
"apps/lib/openssl-bin-cmp_mock_srv.o",
7959+
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
7960+
"apps/lib/uitest-bin-apps_ui.o"
79617961
],
79627962
"products" => {
79637963
"bin" => [
@@ -9632,10 +9632,10 @@ our %unified_info = (
96329632
},
96339633
"providers/fips" => {
96349634
"deps" => [
9635-
"providers/fips/fips-dso-fips_entry.o",
96369635
"providers/fips/libfips-lib-fipsprov.o",
96379636
"providers/fips/libfips-lib-self_test.o",
9638-
"providers/fips/libfips-lib-self_test_kats.o"
9637+
"providers/fips/libfips-lib-self_test_kats.o",
9638+
"providers/fips/fips-dso-fips_entry.o"
96399639
],
96409640
"products" => {
96419641
"dso" => [
@@ -27033,8 +27033,8 @@ unless (caller) {
2703327033
use File::Copy;
2703427034
use Pod::Usage;
2703527035

27036-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
27037-
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/external/perl/MODULES.txt';
27036+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27037+
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
2703827038

2703927039
my $here = dirname($0);
2704027040

@@ -27061,7 +27061,7 @@ unless (caller) {
2706127061
);
2706227062

2706327063
use lib '.';
27064-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
27064+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
2706527065
use gentemplate;
2706627066

2706727067
print 'Creating ',$buildfile_template,"\n";
@@ -27078,8 +27078,8 @@ unless (caller) {
2707827078

2707927079
my $prepend = <<'_____';
2708027080
use File::Spec::Functions;
27081-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/util/perl';
27082-
use lib '/home/danielbevenius/work/nodejs/openssl/deps/openssl/openssl/Configurations';
27081+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27082+
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
2708327083
use lib '.';
2708427084
use platform;
2708527085
_____

‎deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Wed Sep 8 06:03:11 2021 UTC"
14+
#define DATE "built on: Mon Oct 18 06:50:42 2021 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

‎deps/openssl/config/archs/BSD-x86/no-asm/openssl-fips.gypi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@
279279
'./config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c',
280280
'./config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c',
281281
'./config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c',
282+
'./config/archs/BSD-x86/no-asm/providers/legacy.ld',
282283
'./config/archs/BSD-x86/no-asm/providers/fips.ld',
283284

284285
],
@@ -297,7 +298,7 @@
297298
'openssl_ex_libs_BSD-x86': [
298299
'-pthread',
299300
],
300-
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
301+
'linker_script': ''
301302
},
302303
'include_dirs': [
303304
'.',
@@ -309,7 +310,7 @@
309310
'defines': ['<@(openssl_defines_BSD-x86)'],
310311
'cflags': ['<@(openssl_cflags_BSD-x86)'],
311312
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
312-
'ldflags': ['-Wl,--version-script=<@(linker_script)'],
313+
313314
'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
314315
'direct_dependent_settings': {
315316
'include_dirs': ['./include', '.'],

‎deps/openssl/config/archs/BSD-x86/no-asm/openssl.gypi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@
955955
'openssl/providers/implementations/digests/wp_prov.c',
956956
'openssl/providers/implementations/kdfs/pbkdf1.c',
957957
'openssl/providers/prov_running.c',
958+
'openssl/providers/legacyprov.c',
958959
],
959960
'openssl_sources_BSD-x86': [
960961
'./config/archs/BSD-x86/no-asm/providers/common/der/der_sm2_gen.c',
@@ -964,6 +965,7 @@
964965
'./config/archs/BSD-x86/no-asm/providers/common/der/der_ecx_gen.c',
965966
'./config/archs/BSD-x86/no-asm/providers/common/der/der_rsa_gen.c',
966967
'./config/archs/BSD-x86/no-asm/providers/common/der/der_wrap_gen.c',
968+
'./config/archs/BSD-x86/no-asm/providers/legacy.ld',
967969
'./config/archs/BSD-x86/no-asm/providers/fips.ld',
968970
],
969971
'openssl_defines_BSD-x86': [

‎deps/openssl/config/archs/BSD-x86/no-asm/providers/legacy.ld

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
global:
3+
OSSL_provider_init;
4+
local: *;
5+
};

0 commit comments

Comments
 (0)