Skip to content

Commit 9270684

Browse files
richardlautargos
richardlau
authored and
targos
committed
deps: update archs files for OpenSSL-1.1.1l+quic
After an OpenSSL source update, all the config files need to be regenerated and committed by: $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/include/crypto/bn_conf.h $ git add deps/openssl/openssl/include/crypto/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h $ git commit PR-URL: #39867 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Beth Griggs <[email protected]>
1 parent 4b5bbec commit 9270684

File tree

139 files changed

+297
-230
lines changed

Some content is hidden

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

139 files changed

+297
-230
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1k+quic",
115-
version_num => "0x101010bfL",
114+
version => "1.1.1l+quic",
115+
version_num => "0x101010cfL",
116116
);
117117

118118
our %target = (

‎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: Thu Mar 25 15:42:28 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:07:53 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/configdata.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1k+quic",
115-
version_num => "0x101010bfL",
114+
version => "1.1.1l+quic",
115+
version_num => "0x101010cfL",
116116
);
117117

118118
our %target = (

‎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: Thu Mar 25 15:42:31 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:07:57 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/configdata.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86",
112112
tdirs => [ "ossl_shim" ],
113-
version => "1.1.1k+quic",
114-
version_num => "0x101010bfL",
113+
version => "1.1.1l+quic",
114+
version_num => "0x101010cfL",
115115
);
116116

117117
our %target = (

‎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: Thu Mar 25 15:42:33 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:08:02 2021 UTC"
1515

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1k+quic",
115-
version_num => "0x101010bfL",
114+
version => "1.1.1l+quic",
115+
version_num => "0x101010cfL",
116116
);
117117

118118
our %target = (

‎deps/openssl/config/archs/BSD-x86_64/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_64"
14-
#define DATE "built on: Thu Mar 25 15:42:35 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:08:04 2021 UTC"
1515

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1k+quic",
115-
version_num => "0x101010bfL",
114+
version => "1.1.1l+quic",
115+
version_num => "0x101010cfL",
116116
);
117117

118118
our %target = (

‎deps/openssl/config/archs/BSD-x86_64/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_64"
14-
#define DATE "built on: Thu Mar 25 15:42:41 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:08:15 2021 UTC"
1515

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86_64",
112112
tdirs => [ "ossl_shim" ],
113-
version => "1.1.1k+quic",
114-
version_num => "0x101010bfL",
113+
version => "1.1.1l+quic",
114+
version_num => "0x101010cfL",
115115
);
116116

117117
our %target = (

‎deps/openssl/config/archs/BSD-x86_64/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_64"
14-
#define DATE "built on: Thu Mar 25 15:42:47 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:08:26 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN32/asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ our %config = (
115115
sourcedir => ".",
116116
target => "VC-WIN32",
117117
tdirs => [ "ossl_shim" ],
118-
version => "1.1.1k+quic",
119-
version_num => "0x101010bfL",
118+
version => "1.1.1l+quic",
119+
version_num => "0x101010cfL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x55c51430d9f8)",
135+
RANLIB => "CODE(0x55db8a6796f0)",
136136
RC => "rc",
137137
_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" ],
138138
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",

‎deps/openssl/config/archs/VC-WIN32/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: "
14-
#define DATE "built on: Thu Mar 25 15:45:00 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:12:40 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ our %config = (
115115
sourcedir => ".",
116116
target => "VC-WIN32",
117117
tdirs => [ "ossl_shim" ],
118-
version => "1.1.1k+quic",
119-
version_num => "0x101010bfL",
118+
version => "1.1.1l+quic",
119+
version_num => "0x101010cfL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x55ef1e4a36c8)",
135+
RANLIB => "CODE(0x559089244600)",
136136
RC => "rc",
137137
_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" ],
138138
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",

‎deps/openssl/config/archs/VC-WIN32/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: "
14-
#define DATE "built on: Thu Mar 25 15:45:03 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:12:44 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ our %config = (
114114
sourcedir => ".",
115115
target => "VC-WIN32",
116116
tdirs => [ "ossl_shim" ],
117-
version => "1.1.1k+quic",
118-
version_num => "0x101010bfL",
117+
version => "1.1.1l+quic",
118+
version_num => "0x101010cfL",
119119
);
120120

121121
our %target = (
@@ -131,7 +131,7 @@ our %target = (
131131
LDFLAGS => "/nologo /debug",
132132
MT => "mt",
133133
MTFLAGS => "-nologo",
134-
RANLIB => "CODE(0x5643c93df2f8)",
134+
RANLIB => "CODE(0x55977bd52240)",
135135
RC => "rc",
136136
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
137137
aes_asm_src => "aes_core.c aes_cbc.c",

‎deps/openssl/config/archs/VC-WIN32/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: "
14-
#define DATE "built on: Thu Mar 25 15:45:05 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:12:48 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ our %config = (
113113
sourcedir => ".",
114114
target => "VC-WIN64-ARM",
115115
tdirs => [ "ossl_shim" ],
116-
version => "1.1.1k+quic",
117-
version_num => "0x101010bfL",
116+
version => "1.1.1l+quic",
117+
version_num => "0x101010cfL",
118118
);
119119

120120
our %target = (
@@ -128,7 +128,7 @@ our %target = (
128128
LDFLAGS => "/nologo /debug",
129129
MT => "mt",
130130
MTFLAGS => "-nologo",
131-
RANLIB => "CODE(0x564e049cb988)",
131+
RANLIB => "CODE(0x559c5faa5ae0)",
132132
RC => "rc",
133133
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/50-win-onecore.conf", "Configurations/shared-info.pl" ],
134134
aes_asm_src => "aes_core.c aes_cbc.c",

‎deps/openssl/config/archs/VC-WIN64-ARM/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: VC-WIN64-ARM"
14-
#define DATE "built on: Thu Mar 25 15:45:06 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:12:50 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ our %config = (
116116
sourcedir => ".",
117117
target => "VC-WIN64A",
118118
tdirs => [ "ossl_shim" ],
119-
version => "1.1.1k+quic",
120-
version_num => "0x101010bfL",
119+
version => "1.1.1l+quic",
120+
version_num => "0x101010cfL",
121121
);
122122

123123
our %target = (
@@ -133,7 +133,7 @@ our %target = (
133133
LDFLAGS => "/nologo /debug",
134134
MT => "mt",
135135
MTFLAGS => "-nologo",
136-
RANLIB => "CODE(0x55a7657f0078)",
136+
RANLIB => "CODE(0x556c966c8ed0)",
137137
RC => "rc",
138138
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
139139
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",

‎deps/openssl/config/archs/VC-WIN64A/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: "
14-
#define DATE "built on: Thu Mar 25 15:44:47 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:12:14 2021 UTC"
1515

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

‎deps/openssl/config/archs/VC-WIN64A/asm/crypto/chacha/chacha-x86_64.asm

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ $L$ChaCha20_ssse3:
367367
ja NEAR $L$ChaCha20_4x
368368

369369
$L$do_sse3_after_all:
370-
sub rsp,64+40
370+
sub rsp,64+168
371371
movaps XMMWORD[(-40)+r9],xmm6
372372
movaps XMMWORD[(-24)+r9],xmm7
373373
$L$ssse3_body:
@@ -2378,9 +2378,17 @@ $L$ChaCha20_avx512:
23782378
cmp rdx,512
23792379
ja NEAR $L$ChaCha20_16x
23802380

2381-
sub rsp,64+40
2382-
movaps XMMWORD[(-40)+r9],xmm6
2383-
movaps XMMWORD[(-24)+r9],xmm7
2381+
sub rsp,64+168
2382+
movaps XMMWORD[(-168)+r9],xmm6
2383+
movaps XMMWORD[(-152)+r9],xmm7
2384+
movaps XMMWORD[(-136)+r9],xmm8
2385+
movaps XMMWORD[(-120)+r9],xmm9
2386+
movaps XMMWORD[(-104)+r9],xmm10
2387+
movaps XMMWORD[(-88)+r9],xmm11
2388+
movaps XMMWORD[(-72)+r9],xmm12
2389+
movaps XMMWORD[(-56)+r9],xmm13
2390+
movaps XMMWORD[(-40)+r9],xmm14
2391+
movaps XMMWORD[(-24)+r9],xmm15
23842392
$L$avx512_body:
23852393
vbroadcasti32x4 zmm0,ZMMWORD[$L$sigma]
23862394
vbroadcasti32x4 zmm1,ZMMWORD[rcx]
@@ -2560,8 +2568,16 @@ $L$oop_tail_avx512:
25602568

25612569
$L$done_avx512:
25622570
vzeroall
2563-
movaps xmm6,XMMWORD[((-40))+r9]
2564-
movaps xmm7,XMMWORD[((-24))+r9]
2571+
movaps xmm6,XMMWORD[((-168))+r9]
2572+
movaps xmm7,XMMWORD[((-152))+r9]
2573+
movaps xmm8,XMMWORD[((-136))+r9]
2574+
movaps xmm9,XMMWORD[((-120))+r9]
2575+
movaps xmm10,XMMWORD[((-104))+r9]
2576+
movaps xmm11,XMMWORD[((-88))+r9]
2577+
movaps xmm12,XMMWORD[((-72))+r9]
2578+
movaps xmm13,XMMWORD[((-56))+r9]
2579+
movaps xmm14,XMMWORD[((-40))+r9]
2580+
movaps xmm15,XMMWORD[((-24))+r9]
25652581
lea rsp,[r9]
25662582

25672583
$L$avx512_epilogue:
@@ -2591,9 +2607,17 @@ $L$ChaCha20_avx512vl:
25912607
cmp rdx,128
25922608
ja NEAR $L$ChaCha20_8xvl
25932609

2594-
sub rsp,64+40
2595-
movaps XMMWORD[(-40)+r9],xmm6
2596-
movaps XMMWORD[(-24)+r9],xmm7
2610+
sub rsp,64+168
2611+
movaps XMMWORD[(-168)+r9],xmm6
2612+
movaps XMMWORD[(-152)+r9],xmm7
2613+
movaps XMMWORD[(-136)+r9],xmm8
2614+
movaps XMMWORD[(-120)+r9],xmm9
2615+
movaps XMMWORD[(-104)+r9],xmm10
2616+
movaps XMMWORD[(-88)+r9],xmm11
2617+
movaps XMMWORD[(-72)+r9],xmm12
2618+
movaps XMMWORD[(-56)+r9],xmm13
2619+
movaps XMMWORD[(-40)+r9],xmm14
2620+
movaps XMMWORD[(-24)+r9],xmm15
25972621
$L$avx512vl_body:
25982622
vbroadcasti128 ymm0,XMMWORD[$L$sigma]
25992623
vbroadcasti128 ymm1,XMMWORD[rcx]
@@ -2730,8 +2754,16 @@ $L$oop_tail_avx512vl:
27302754

27312755
$L$done_avx512vl:
27322756
vzeroall
2733-
movaps xmm6,XMMWORD[((-40))+r9]
2734-
movaps xmm7,XMMWORD[((-24))+r9]
2757+
movaps xmm6,XMMWORD[((-168))+r9]
2758+
movaps xmm7,XMMWORD[((-152))+r9]
2759+
movaps xmm8,XMMWORD[((-136))+r9]
2760+
movaps xmm9,XMMWORD[((-120))+r9]
2761+
movaps xmm10,XMMWORD[((-104))+r9]
2762+
movaps xmm11,XMMWORD[((-88))+r9]
2763+
movaps xmm12,XMMWORD[((-72))+r9]
2764+
movaps xmm13,XMMWORD[((-56))+r9]
2765+
movaps xmm14,XMMWORD[((-40))+r9]
2766+
movaps xmm15,XMMWORD[((-24))+r9]
27352767
lea rsp,[r9]
27362768

27372769
$L$avx512vl_epilogue:

‎deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ our %config = (
116116
sourcedir => ".",
117117
target => "VC-WIN64A",
118118
tdirs => [ "ossl_shim" ],
119-
version => "1.1.1k+quic",
120-
version_num => "0x101010bfL",
119+
version => "1.1.1l+quic",
120+
version_num => "0x101010cfL",
121121
);
122122

123123
our %target = (
@@ -133,7 +133,7 @@ our %target = (
133133
LDFLAGS => "/nologo /debug",
134134
MT => "mt",
135135
MTFLAGS => "-nologo",
136-
RANLIB => "CODE(0x55ef6679a0b8)",
136+
RANLIB => "CODE(0x5596a5c60760)",
137137
RC => "rc",
138138
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
139139
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",

‎deps/openssl/config/archs/VC-WIN64A/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: "
14-
#define DATE "built on: Thu Mar 25 15:44:53 2021 UTC"
14+
#define DATE "built on: Tue Aug 24 15:12:26 2021 UTC"
1515

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

0 commit comments

Comments
 (0)