Skip to content

Commit 7202792

Browse files
sam-githubBethGriggs
sam-github
authored and
BethGriggs
committed
deps: update archs files for OpenSSL-1.1.1d
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: #29921 Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 9c393f1 commit 7202792

File tree

163 files changed

+1602
-994
lines changed

Some content is hidden

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

163 files changed

+1602
-994
lines changed

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

Lines changed: 32 additions & 22 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_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AES_ASM", "VPAES_ASM", "BSAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
51+
lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_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_64",
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/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
127-
aes_asm_src => "aes-x86_64.s vpaes-x86_64.s bsaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
128-
aes_obj => "aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o",
127+
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
128+
aes_obj => "aes_core.o aes_cbc.o vpaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o",
129129
apps_aux_src => "",
130130
apps_init_src => "",
131131
apps_obj => "",
@@ -1693,8 +1693,9 @@ our %unified_info = (
16931693
{
16941694
"deps" =>
16951695
[
1696-
"crypto/aes/aes-x86_64.o",
1696+
"crypto/aes/aes_cbc.o",
16971697
"crypto/aes/aes_cfb.o",
1698+
"crypto/aes/aes_core.o",
16981699
"crypto/aes/aes_ecb.o",
16991700
"crypto/aes/aes_ige.o",
17001701
"crypto/aes/aes_misc.o",
@@ -1704,7 +1705,6 @@ our %unified_info = (
17041705
"crypto/aes/aesni-sha1-x86_64.o",
17051706
"crypto/aes/aesni-sha256-x86_64.o",
17061707
"crypto/aes/aesni-x86_64.o",
1707-
"crypto/aes/bsaes-x86_64.o",
17081708
"crypto/aes/vpaes-x86_64.o",
17091709
],
17101710
"products" =>
@@ -3260,6 +3260,7 @@ our %unified_info = (
32603260
"test/testutil/init.o",
32613261
"test/testutil/main.o",
32623262
"test/testutil/output_helpers.o",
3263+
"test/testutil/random.o",
32633264
"test/testutil/stanza.o",
32643265
"test/testutil/tap_bio.o",
32653266
"test/testutil/test_cleanup.o",
@@ -4901,7 +4902,7 @@ our %unified_info = (
49014902
[
49024903
"crypto",
49034904
],
4904-
"crypto/aes/aes-x86_64.o" =>
4905+
"crypto/aes/aes_cbc.o" =>
49054906
[
49064907
".",
49074908
"crypto/include",
@@ -4913,6 +4914,12 @@ our %unified_info = (
49134914
"crypto/include",
49144915
"include",
49154916
],
4917+
"crypto/aes/aes_core.o" =>
4918+
[
4919+
".",
4920+
"crypto/include",
4921+
"include",
4922+
],
49164923
"crypto/aes/aes_ecb.o" =>
49174924
[
49184925
".",
@@ -4983,12 +4990,6 @@ our %unified_info = (
49834990
[
49844991
"crypto",
49854992
],
4986-
"crypto/aes/bsaes-x86_64.o" =>
4987-
[
4988-
".",
4989-
"crypto/include",
4990-
"include",
4991-
],
49924993
"crypto/aes/vpaes-x86_64.o" =>
49934994
[
49944995
".",
@@ -10097,6 +10098,10 @@ our %unified_info = (
1009710098
[
1009810099
"include",
1009910100
],
10101+
"test/testutil/random.o" =>
10102+
[
10103+
"include",
10104+
],
1010010105
"test/testutil/stanza.o" =>
1010110106
[
1010210107
"include",
@@ -10730,14 +10735,18 @@ our %unified_info = (
1073010735
[
1073110736
"apps/x509.c",
1073210737
],
10733-
"crypto/aes/aes-x86_64.o" =>
10738+
"crypto/aes/aes_cbc.o" =>
1073410739
[
10735-
"crypto/aes/aes-x86_64.s",
10740+
"crypto/aes/aes_cbc.c",
1073610741
],
1073710742
"crypto/aes/aes_cfb.o" =>
1073810743
[
1073910744
"crypto/aes/aes_cfb.c",
1074010745
],
10746+
"crypto/aes/aes_core.o" =>
10747+
[
10748+
"crypto/aes/aes_core.c",
10749+
],
1074110750
"crypto/aes/aes_ecb.o" =>
1074210751
[
1074310752
"crypto/aes/aes_ecb.c",
@@ -10774,10 +10783,6 @@ our %unified_info = (
1077410783
[
1077510784
"crypto/aes/aesni-x86_64.s",
1077610785
],
10777-
"crypto/aes/bsaes-x86_64.o" =>
10778-
[
10779-
"crypto/aes/bsaes-x86_64.s",
10780-
],
1078110786
"crypto/aes/vpaes-x86_64.o" =>
1078210787
[
1078310788
"crypto/aes/vpaes-x86_64.s",
@@ -13475,8 +13480,9 @@ our %unified_info = (
1347513480
],
1347613481
"libcrypto" =>
1347713482
[
13478-
"crypto/aes/aes-x86_64.o",
13483+
"crypto/aes/aes_cbc.o",
1347913484
"crypto/aes/aes_cfb.o",
13485+
"crypto/aes/aes_core.o",
1348013486
"crypto/aes/aes_ecb.o",
1348113487
"crypto/aes/aes_ige.o",
1348213488
"crypto/aes/aes_misc.o",
@@ -13486,7 +13492,6 @@ our %unified_info = (
1348613492
"crypto/aes/aesni-sha1-x86_64.o",
1348713493
"crypto/aes/aesni-sha256-x86_64.o",
1348813494
"crypto/aes/aesni-x86_64.o",
13489-
"crypto/aes/bsaes-x86_64.o",
1349013495
"crypto/aes/vpaes-x86_64.o",
1349113496
"crypto/aria/aria.o",
1349213497
"crypto/asn1/a_bitstr.o",
@@ -15390,6 +15395,7 @@ our %unified_info = (
1539015395
"test/testutil/init.o",
1539115396
"test/testutil/main.o",
1539215397
"test/testutil/output_helpers.o",
15398+
"test/testutil/random.o",
1539315399
"test/testutil/stanza.o",
1539415400
"test/testutil/tap_bio.o",
1539515401
"test/testutil/test_cleanup.o",
@@ -15735,6 +15741,10 @@ our %unified_info = (
1573515741
[
1573615742
"test/testutil/output_helpers.c",
1573715743
],
15744+
"test/testutil/random.o" =>
15745+
[
15746+
"test/testutil/random.c",
15747+
],
1573815748
"test/testutil/stanza.o" =>
1573915749
[
1574015750
"test/testutil/stanza.c",

‎deps/openssl/config/archs/BSD-x86_64/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_64"
14-
#define DATE "built on: Thu Jun 13 19:22:10 2019 UTC"
14+
#define DATE "built on: Thu Oct 10 15:43:19 2019 UTC"
1515

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
'KECCAK1600_ASM',
1616
'RC4_ASM',
1717
'MD5_ASM',
18-
'AES_ASM',
1918
'VPAES_ASM',
20-
'BSAES_ASM',
2119
'GHASH_ASM',
2220
'ECP_NISTZ256_ASM',
2321
'X25519_ASM',

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

Lines changed: 2 additions & 4 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',
@@ -676,12 +678,10 @@
676678
'openssl/engines/e_padlock.c',
677679
],
678680
'openssl_sources_BSD-x86_64': [
679-
'./config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s',
680681
'./config/archs/BSD-x86_64/asm/crypto/aes/aesni-mb-x86_64.s',
681682
'./config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s',
682683
'./config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s',
683684
'./config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s',
684-
'./config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s',
685685
'./config/archs/BSD-x86_64/asm/crypto/aes/vpaes-x86_64.s',
686686
'./config/archs/BSD-x86_64/asm/crypto/bn/rsaz-avx2.s',
687687
'./config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s',
@@ -723,9 +723,7 @@
723723
'KECCAK1600_ASM',
724724
'RC4_ASM',
725725
'MD5_ASM',
726-
'AES_ASM',
727726
'VPAES_ASM',
728-
'BSAES_ASM',
729727
'GHASH_ASM',
730728
'ECP_NISTZ256_ASM',
731729
'X25519_ASM',

0 commit comments

Comments
 (0)