Skip to content

Commit 7f694f7

Browse files
danbevdanbev
committed
deps: regenerate OpenSSL arch files
This commit regenerates the OpenSSL architecture files after the update in Commmit 04326f3 ("deps: add missing legacyprov.c source").
1 parent f5374d3 commit 7f694f7

File tree

393 files changed

+6298
-3819
lines changed

Some content is hidden

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

393 files changed

+6298
-3819
lines changed

‎deps/openssl/config/.generate_gypi.pl.swp

32 KB
Binary file not shown.

‎deps/openssl/config/archs/BSD-x86/asm/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/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: Sat Oct 16 04:06:33 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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,7 @@
298298
'./config/archs/BSD-x86/asm/providers/common/der/der_ecx_gen.c',
299299
'./config/archs/BSD-x86/asm/providers/common/der/der_rsa_gen.c',
300300
'./config/archs/BSD-x86/asm/providers/common/der/der_wrap_gen.c',
301-
'./config/archs/BSD-x86/asm/crypto/bn/bn-586.s',
302-
'./config/archs/BSD-x86/asm/crypto/bn/co-586.s',
303-
'./config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.s',
304-
'./config/archs/BSD-x86/asm/crypto/bn/x86-mont.s',
305-
'./config/archs/BSD-x86/asm/crypto/des/crypt586.s',
306-
'./config/archs/BSD-x86/asm/crypto/des/des-586.s',
307-
'./config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
301+
'./config/archs/BSD-x86/asm/providers/legacy.ld',
308302
'./config/archs/BSD-x86/asm/providers/fips.ld',
309303

310304
],
@@ -337,7 +331,7 @@
337331
'openssl_ex_libs_BSD-x86': [
338332
'-pthread',
339333
],
340-
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
334+
'version_script': ''
341335
},
342336
'include_dirs': [
343337
'.',
@@ -349,7 +343,7 @@
349343
'defines': ['<@(openssl_defines_BSD-x86)'],
350344
'cflags': ['<@(openssl_cflags_BSD-x86)'],
351345
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
352-
'ldflags': ['-Wl,--version-script=<@(linker_script)'],
346+
353347
'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
354348
'direct_dependent_settings': {
355349
'include_dirs': ['./include', '.'],

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
'variables': {
3+
'openssl_sources': [
4+
'openssl/crypto/md5/md5_dgst.c',
5+
'openssl/crypto/md5/md5_one.c',
6+
'openssl/crypto/md5/md5_sha1.c',
7+
'openssl/providers/implementations/ciphers/cipher_blowfish.c',
8+
'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c',
9+
'openssl/providers/implementations/ciphers/cipher_cast5.c',
10+
'openssl/providers/implementations/ciphers/cipher_cast5_hw.c',
11+
'openssl/providers/implementations/ciphers/cipher_des.c',
12+
'openssl/providers/implementations/ciphers/cipher_des_hw.c',
13+
'openssl/providers/implementations/ciphers/cipher_desx.c',
14+
'openssl/providers/implementations/ciphers/cipher_desx_hw.c',
15+
'openssl/providers/implementations/ciphers/cipher_idea.c',
16+
'openssl/providers/implementations/ciphers/cipher_idea_hw.c',
17+
'openssl/providers/implementations/ciphers/cipher_rc2.c',
18+
'openssl/providers/implementations/ciphers/cipher_rc2_hw.c',
19+
'openssl/providers/implementations/ciphers/cipher_rc4.c',
20+
'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c',
21+
'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c',
22+
'openssl/providers/implementations/ciphers/cipher_rc4_hw.c',
23+
'openssl/providers/implementations/ciphers/cipher_seed.c',
24+
'openssl/providers/implementations/ciphers/cipher_seed_hw.c',
25+
'openssl/providers/implementations/ciphers/cipher_tdes_common.c',
26+
'openssl/providers/implementations/digests/md4_prov.c',
27+
'openssl/providers/implementations/digests/mdc2_prov.c',
28+
'openssl/providers/implementations/digests/ripemd_prov.c',
29+
'openssl/providers/implementations/digests/wp_prov.c',
30+
'openssl/providers/implementations/kdfs/pbkdf1.c',
31+
'openssl/providers/prov_running.c',
32+
'openssl/providers/legacyprov.c',
33+
34+
],
35+
'openssl_sources_BSD-x86': [
36+
37+
],
38+
'openssl_defines_BSD-x86': [
39+
'NDEBUG',
40+
'L_ENDIAN',
41+
'OPENSSL_BUILDING_OPENSSL',
42+
'DES_ASM',
43+
'MD5_ASM',
44+
'OPENSSL_BN_ASM_GF2m',
45+
'OPENSSL_BN_ASM_MONT',
46+
'OPENSSL_BN_ASM_PART_WORDS',
47+
'OPENSSL_IA32_SSE2',
48+
],
49+
'openssl_cflags_BSD-x86': [
50+
'-Wa,--noexecstack',
51+
'-Wall -O3 -fomit-frame-pointer',
52+
'-pthread',
53+
'-Wall -O3 -fomit-frame-pointer',
54+
],
55+
'openssl_ex_libs_BSD-x86': [
56+
'-pthread',
57+
],
58+
'version_script': ''
59+
},
60+
'include_dirs': [
61+
'.',
62+
'./include',
63+
'./crypto',
64+
'./crypto/include/internal',
65+
'./providers/common/include',
66+
],
67+
'defines': ['<@(openssl_defines_BSD-x86)'],
68+
'cflags': ['<@(openssl_cflags_BSD-x86)'],
69+
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
70+
71+
'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
72+
'direct_dependent_settings': {
73+
'include_dirs': ['./include', '.'],
74+
'defines': ['<@(openssl_defines_BSD-x86)'],
75+
},
76+
}

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

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -912,34 +912,6 @@
912912
'openssl/providers/implementations/ciphers/ciphercommon_hw.c',
913913
'openssl/providers/implementations/digests/digestcommon.c',
914914
'openssl/ssl/record/tls_pad.c',
915-
'openssl/crypto/md5/md5_dgst.c',
916-
'openssl/crypto/md5/md5_one.c',
917-
'openssl/crypto/md5/md5_sha1.c',
918-
'openssl/providers/implementations/ciphers/cipher_blowfish.c',
919-
'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c',
920-
'openssl/providers/implementations/ciphers/cipher_cast5.c',
921-
'openssl/providers/implementations/ciphers/cipher_cast5_hw.c',
922-
'openssl/providers/implementations/ciphers/cipher_des.c',
923-
'openssl/providers/implementations/ciphers/cipher_des_hw.c',
924-
'openssl/providers/implementations/ciphers/cipher_desx.c',
925-
'openssl/providers/implementations/ciphers/cipher_desx_hw.c',
926-
'openssl/providers/implementations/ciphers/cipher_idea.c',
927-
'openssl/providers/implementations/ciphers/cipher_idea_hw.c',
928-
'openssl/providers/implementations/ciphers/cipher_rc2.c',
929-
'openssl/providers/implementations/ciphers/cipher_rc2_hw.c',
930-
'openssl/providers/implementations/ciphers/cipher_rc4.c',
931-
'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c',
932-
'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c',
933-
'openssl/providers/implementations/ciphers/cipher_rc4_hw.c',
934-
'openssl/providers/implementations/ciphers/cipher_seed.c',
935-
'openssl/providers/implementations/ciphers/cipher_seed_hw.c',
936-
'openssl/providers/implementations/ciphers/cipher_tdes_common.c',
937-
'openssl/providers/implementations/digests/md4_prov.c',
938-
'openssl/providers/implementations/digests/mdc2_prov.c',
939-
'openssl/providers/implementations/digests/ripemd_prov.c',
940-
'openssl/providers/implementations/digests/wp_prov.c',
941-
'openssl/providers/implementations/kdfs/pbkdf1.c',
942-
'openssl/providers/prov_running.c',
943915
],
944916
'openssl_sources_BSD-x86': [
945917
'./config/archs/BSD-x86/asm/crypto/aes/aes-586.s',
@@ -973,13 +945,7 @@
973945
'./config/archs/BSD-x86/asm/providers/common/der/der_ecx_gen.c',
974946
'./config/archs/BSD-x86/asm/providers/common/der/der_rsa_gen.c',
975947
'./config/archs/BSD-x86/asm/providers/common/der/der_wrap_gen.c',
976-
'./config/archs/BSD-x86/asm/crypto/bn/bn-586.s',
977-
'./config/archs/BSD-x86/asm/crypto/bn/co-586.s',
978-
'./config/archs/BSD-x86/asm/crypto/bn/x86-gf2m.s',
979-
'./config/archs/BSD-x86/asm/crypto/bn/x86-mont.s',
980-
'./config/archs/BSD-x86/asm/crypto/des/crypt586.s',
981-
'./config/archs/BSD-x86/asm/crypto/des/des-586.s',
982-
'./config/archs/BSD-x86/asm/crypto/md5/md5-586.s',
948+
'./config/archs/BSD-x86/asm/providers/legacy.ld',
983949
'./config/archs/BSD-x86/asm/providers/fips.ld',
984950
],
985951
'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: 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_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: Sat Oct 16 04:06:48 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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,7 @@
298298
'./config/archs/BSD-x86/asm_avx2/providers/common/der/der_ecx_gen.c',
299299
'./config/archs/BSD-x86/asm_avx2/providers/common/der/der_rsa_gen.c',
300300
'./config/archs/BSD-x86/asm_avx2/providers/common/der/der_wrap_gen.c',
301-
'./config/archs/BSD-x86/asm_avx2/crypto/bn/bn-586.s',
302-
'./config/archs/BSD-x86/asm_avx2/crypto/bn/co-586.s',
303-
'./config/archs/BSD-x86/asm_avx2/crypto/bn/x86-gf2m.s',
304-
'./config/archs/BSD-x86/asm_avx2/crypto/bn/x86-mont.s',
305-
'./config/archs/BSD-x86/asm_avx2/crypto/des/crypt586.s',
306-
'./config/archs/BSD-x86/asm_avx2/crypto/des/des-586.s',
307-
'./config/archs/BSD-x86/asm_avx2/crypto/md5/md5-586.s',
301+
'./config/archs/BSD-x86/asm_avx2/providers/legacy.ld',
308302
'./config/archs/BSD-x86/asm_avx2/providers/fips.ld',
309303

310304
],
@@ -337,7 +331,7 @@
337331
'openssl_ex_libs_BSD-x86': [
338332
'-pthread',
339333
],
340-
'linker_script': '/home/danielbevenius/work/nodejs/openssl/deps/openssl/config'
334+
'version_script': ''
341335
},
342336
'include_dirs': [
343337
'.',
@@ -349,7 +343,7 @@
349343
'defines': ['<@(openssl_defines_BSD-x86)'],
350344
'cflags': ['<@(openssl_cflags_BSD-x86)'],
351345
'libraries': ['<@(openssl_ex_libs_BSD-x86)'],
352-
'ldflags': ['-Wl,--version-script=<@(linker_script)'],
346+
353347
'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'],
354348
'direct_dependent_settings': {
355349
'include_dirs': ['./include', '.'],

0 commit comments

Comments
 (0)