Skip to content

Commit 5eb013b

Browse files
sam-githubBridgeAR
sam-github
authored and
BridgeAR
committed
deps: update archs files for OpenSSL-1.1.1
After an OpenSSL source update, all the config files need to be regenerated and comitted by: $ cd deps/openssl/config $ make $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h $ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h $ git commit PR-URL: #29550 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent 1766cfc commit 5eb013b

File tree

197 files changed

+34115
-2136
lines changed

Some content is hidden

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

197 files changed

+34115
-2136
lines changed

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

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ our %config = (
4848
export_var_as_fn => "0",
4949
includes => [ ],
5050
lflags => [ ],
51-
lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AES_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
51+
lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
5252
libdir => "",
5353
major => "1",
5454
makedepprog => "\$(CROSS_COMPILE)gcc",
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1c",
115-
version_num => "0x1010103fL",
114+
version => "1.1.1d",
115+
version_num => "0x1010104fL",
116116
);
117117

118118
our %target = (
@@ -124,8 +124,8 @@ our %target = (
124124
RANLIB => "ranlib",
125125
RC => "windres",
126126
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
127-
aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s",
128-
aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o",
127+
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
128+
aes_obj => "aes_core.o aes_cbc.o vpaes-x86.o aesni-x86.o",
129129
apps_aux_src => "",
130130
apps_init_src => "",
131131
apps_obj => "",
@@ -1683,8 +1683,9 @@ our %unified_info = (
16831683
{
16841684
"deps" =>
16851685
[
1686-
"crypto/aes/aes-586.o",
1686+
"crypto/aes/aes_cbc.o",
16871687
"crypto/aes/aes_cfb.o",
1688+
"crypto/aes/aes_core.o",
16881689
"crypto/aes/aes_ecb.o",
16891690
"crypto/aes/aes_ige.o",
16901691
"crypto/aes/aes_misc.o",
@@ -3226,6 +3227,7 @@ our %unified_info = (
32263227
"test/testutil/init.o",
32273228
"test/testutil/main.o",
32283229
"test/testutil/output_helpers.o",
3230+
"test/testutil/random.o",
32293231
"test/testutil/stanza.o",
32303232
"test/testutil/tap_bio.o",
32313233
"test/testutil/test_cleanup.o",
@@ -4839,12 +4841,6 @@ our %unified_info = (
48394841
"include",
48404842
"apps",
48414843
],
4842-
"crypto/aes/aes-586.o" =>
4843-
[
4844-
".",
4845-
"crypto/include",
4846-
"include",
4847-
],
48484844
"crypto/aes/aes-armv4.o" =>
48494845
[
48504846
"crypto",
@@ -4861,12 +4857,24 @@ our %unified_info = (
48614857
[
48624858
"crypto",
48634859
],
4860+
"crypto/aes/aes_cbc.o" =>
4861+
[
4862+
".",
4863+
"crypto/include",
4864+
"include",
4865+
],
48644866
"crypto/aes/aes_cfb.o" =>
48654867
[
48664868
".",
48674869
"crypto/include",
48684870
"include",
48694871
],
4872+
"crypto/aes/aes_core.o" =>
4873+
[
4874+
".",
4875+
"crypto/include",
4876+
"include",
4877+
],
48704878
"crypto/aes/aes_ecb.o" =>
48714879
[
48724880
".",
@@ -9985,6 +9993,10 @@ our %unified_info = (
99859993
[
99869994
"include",
99879995
],
9996+
"test/testutil/random.o" =>
9997+
[
9998+
"include",
9999+
],
998810000
"test/testutil/stanza.o" =>
998910001
[
999010002
"include",
@@ -10618,14 +10630,18 @@ our %unified_info = (
1061810630
[
1061910631
"apps/x509.c",
1062010632
],
10621-
"crypto/aes/aes-586.o" =>
10633+
"crypto/aes/aes_cbc.o" =>
1062210634
[
10623-
"crypto/aes/aes-586.s",
10635+
"crypto/aes/aes_cbc.c",
1062410636
],
1062510637
"crypto/aes/aes_cfb.o" =>
1062610638
[
1062710639
"crypto/aes/aes_cfb.c",
1062810640
],
10641+
"crypto/aes/aes_core.o" =>
10642+
[
10643+
"crypto/aes/aes_core.c",
10644+
],
1062910645
"crypto/aes/aes_ecb.o" =>
1063010646
[
1063110647
"crypto/aes/aes_ecb.c",
@@ -13319,8 +13335,9 @@ our %unified_info = (
1331913335
],
1332013336
"libcrypto" =>
1332113337
[
13322-
"crypto/aes/aes-586.o",
13338+
"crypto/aes/aes_cbc.o",
1332313339
"crypto/aes/aes_cfb.o",
13340+
"crypto/aes/aes_core.o",
1332413341
"crypto/aes/aes_ecb.o",
1332513342
"crypto/aes/aes_ige.o",
1332613343
"crypto/aes/aes_misc.o",
@@ -15223,6 +15240,7 @@ our %unified_info = (
1522315240
"test/testutil/init.o",
1522415241
"test/testutil/main.o",
1522515242
"test/testutil/output_helpers.o",
15243+
"test/testutil/random.o",
1522615244
"test/testutil/stanza.o",
1522715245
"test/testutil/tap_bio.o",
1522815246
"test/testutil/test_cleanup.o",
@@ -15568,6 +15586,10 @@ our %unified_info = (
1556815586
[
1556915587
"test/testutil/output_helpers.c",
1557015588
],
15589+
"test/testutil/random.o" =>
15590+
[
15591+
"test/testutil/random.c",
15592+
],
1557115593
"test/testutil/stanza.o" =>
1557215594
[
1557315595
"test/testutil/stanza.c",

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

Lines changed: 9 additions & 10 deletions
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: Mon Jul 22 14:54:03 2019 UTC"
14+
#define DATE "built on: Fri Sep 13 15:57:16 2019 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a
@@ -36,13 +36,12 @@ static const char compiler_flags[] = {
3636
'M',' ','-','D','S','H','A','2','5','6','_','A','S','M',' ','-',
3737
'D','S','H','A','5','1','2','_','A','S','M',' ','-','D','R','C',
3838
'4','_','A','S','M',' ','-','D','M','D','5','_','A','S','M',' ',
39-
'-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','A',
40-
'E','S','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
41-
'S','M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A',
42-
'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-',
43-
'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S',
44-
'M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',
45-
' ','-','D','_','T','H','R','E','A','D','_','S','A','F','E',' ',
46-
'-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N',
47-
'D','E','B','U','G','\0'
39+
'-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','V',
40+
'P','A','E','S','_','A','S','M',' ','-','D','W','H','I','R','L',
41+
'P','O','O','L','_','A','S','M',' ','-','D','G','H','A','S','H',
42+
'_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z',
43+
'2','5','6','_','A','S','M',' ','-','D','P','O','L','Y','1','3',
44+
'0','5','_','A','S','M',' ','-','D','_','T','H','R','E','A','D',
45+
'_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A',
46+
'N','T',' ','-','D','N','D','E','B','U','G','\0'
4847
};

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
'RC4_ASM',
1616
'MD5_ASM',
1717
'RMD160_ASM',
18-
'AES_ASM',
1918
'VPAES_ASM',
2019
'WHIRLPOOL_ASM',
2120
'GHASH_ASM',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
'openssl/ssl/t1_trce.c',
4646
'openssl/ssl/tls13_enc.c',
4747
'openssl/ssl/tls_srp.c',
48+
'openssl/crypto/aes/aes_cbc.c',
4849
'openssl/crypto/aes/aes_cfb.c',
50+
'openssl/crypto/aes/aes_core.c',
4951
'openssl/crypto/aes/aes_ecb.c',
5052
'openssl/crypto/aes/aes_ige.c',
5153
'openssl/crypto/aes/aes_misc.c',
@@ -672,7 +674,6 @@
672674
'openssl/engines/e_padlock.c',
673675
],
674676
'openssl_sources_BSD-x86': [
675-
'./config/archs/BSD-x86/asm/crypto/aes/aes-586.s',
676677
'./config/archs/BSD-x86/asm/crypto/aes/aesni-x86.s',
677678
'./config/archs/BSD-x86/asm/crypto/aes/vpaes-x86.s',
678679
'./config/archs/BSD-x86/asm/crypto/bf/bf-586.s',
@@ -712,7 +713,6 @@
712713
'RC4_ASM',
713714
'MD5_ASM',
714715
'RMD160_ASM',
715-
'AES_ASM',
716716
'VPAES_ASM',
717717
'WHIRLPOOL_ASM',
718718
'GHASH_ASM',

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

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ our %config = (
4848
export_var_as_fn => "0",
4949
includes => [ ],
5050
lflags => [ ],
51-
lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AES_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
51+
lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
5252
libdir => "",
5353
major => "1",
5454
makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1c",
115-
version_num => "0x1010103fL",
114+
version => "1.1.1d",
115+
version_num => "0x1010104fL",
116116
);
117117

118118
our %target = (
@@ -124,8 +124,8 @@ our %target = (
124124
RANLIB => "ranlib",
125125
RC => "windres",
126126
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
127-
aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s",
128-
aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o",
127+
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
128+
aes_obj => "aes_core.o aes_cbc.o vpaes-x86.o aesni-x86.o",
129129
apps_aux_src => "",
130130
apps_init_src => "",
131131
apps_obj => "",
@@ -1683,8 +1683,9 @@ our %unified_info = (
16831683
{
16841684
"deps" =>
16851685
[
1686-
"crypto/aes/aes-586.o",
1686+
"crypto/aes/aes_cbc.o",
16871687
"crypto/aes/aes_cfb.o",
1688+
"crypto/aes/aes_core.o",
16881689
"crypto/aes/aes_ecb.o",
16891690
"crypto/aes/aes_ige.o",
16901691
"crypto/aes/aes_misc.o",
@@ -3226,6 +3227,7 @@ our %unified_info = (
32263227
"test/testutil/init.o",
32273228
"test/testutil/main.o",
32283229
"test/testutil/output_helpers.o",
3230+
"test/testutil/random.o",
32293231
"test/testutil/stanza.o",
32303232
"test/testutil/tap_bio.o",
32313233
"test/testutil/test_cleanup.o",
@@ -4839,12 +4841,6 @@ our %unified_info = (
48394841
"include",
48404842
"apps",
48414843
],
4842-
"crypto/aes/aes-586.o" =>
4843-
[
4844-
".",
4845-
"crypto/include",
4846-
"include",
4847-
],
48484844
"crypto/aes/aes-armv4.o" =>
48494845
[
48504846
"crypto",
@@ -4861,12 +4857,24 @@ our %unified_info = (
48614857
[
48624858
"crypto",
48634859
],
4860+
"crypto/aes/aes_cbc.o" =>
4861+
[
4862+
".",
4863+
"crypto/include",
4864+
"include",
4865+
],
48644866
"crypto/aes/aes_cfb.o" =>
48654867
[
48664868
".",
48674869
"crypto/include",
48684870
"include",
48694871
],
4872+
"crypto/aes/aes_core.o" =>
4873+
[
4874+
".",
4875+
"crypto/include",
4876+
"include",
4877+
],
48704878
"crypto/aes/aes_ecb.o" =>
48714879
[
48724880
".",
@@ -9985,6 +9993,10 @@ our %unified_info = (
99859993
[
99869994
"include",
99879995
],
9996+
"test/testutil/random.o" =>
9997+
[
9998+
"include",
9999+
],
998810000
"test/testutil/stanza.o" =>
998910001
[
999010002
"include",
@@ -10618,14 +10630,18 @@ our %unified_info = (
1061810630
[
1061910631
"apps/x509.c",
1062010632
],
10621-
"crypto/aes/aes-586.o" =>
10633+
"crypto/aes/aes_cbc.o" =>
1062210634
[
10623-
"crypto/aes/aes-586.s",
10635+
"crypto/aes/aes_cbc.c",
1062410636
],
1062510637
"crypto/aes/aes_cfb.o" =>
1062610638
[
1062710639
"crypto/aes/aes_cfb.c",
1062810640
],
10641+
"crypto/aes/aes_core.o" =>
10642+
[
10643+
"crypto/aes/aes_core.c",
10644+
],
1062910645
"crypto/aes/aes_ecb.o" =>
1063010646
[
1063110647
"crypto/aes/aes_ecb.c",
@@ -13319,8 +13335,9 @@ our %unified_info = (
1331913335
],
1332013336
"libcrypto" =>
1332113337
[
13322-
"crypto/aes/aes-586.o",
13338+
"crypto/aes/aes_cbc.o",
1332313339
"crypto/aes/aes_cfb.o",
13340+
"crypto/aes/aes_core.o",
1332413341
"crypto/aes/aes_ecb.o",
1332513342
"crypto/aes/aes_ige.o",
1332613343
"crypto/aes/aes_misc.o",
@@ -15223,6 +15240,7 @@ our %unified_info = (
1522315240
"test/testutil/init.o",
1522415241
"test/testutil/main.o",
1522515242
"test/testutil/output_helpers.o",
15243+
"test/testutil/random.o",
1522615244
"test/testutil/stanza.o",
1522715245
"test/testutil/tap_bio.o",
1522815246
"test/testutil/test_cleanup.o",
@@ -15568,6 +15586,10 @@ our %unified_info = (
1556815586
[
1556915587
"test/testutil/output_helpers.c",
1557015588
],
15589+
"test/testutil/random.o" =>
15590+
[
15591+
"test/testutil/random.c",
15592+
],
1557115593
"test/testutil/stanza.o" =>
1557215594
[
1557315595
"test/testutil/stanza.c",

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

Lines changed: 8 additions & 9 deletions
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: Mon Jul 22 14:54:06 2019 UTC"
14+
#define DATE "built on: Fri Sep 13 15:57:23 2019 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a
@@ -38,12 +38,11 @@ static const char compiler_flags[] = {
3838
' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-','D',
3939
'R','C','4','_','A','S','M',' ','-','D','M','D','5','_','A','S',
4040
'M',' ','-','D','R','M','D','1','6','0','_','A','S','M',' ','-',
41-
'D','A','E','S','_','A','S','M',' ','-','D','V','P','A','E','S',
42-
'_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
43-
'_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
44-
' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
45-
'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A',
46-
'S','M',' ','-','D','_','T','H','R','E','A','D','_','S','A','F',
47-
'E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-',
48-
'D','N','D','E','B','U','G','\0'
41+
'D','V','P','A','E','S','_','A','S','M',' ','-','D','W','H','I',
42+
'R','L','P','O','O','L','_','A','S','M',' ','-','D','G','H','A',
43+
'S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I','S',
44+
'T','Z','2','5','6','_','A','S','M',' ','-','D','P','O','L','Y',
45+
'1','3','0','5','_','A','S','M',' ','-','D','_','T','H','R','E',
46+
'A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N','T',
47+
'R','A','N','T',' ','-','D','N','D','E','B','U','G','\0'
4948
};

0 commit comments

Comments
 (0)