Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1l+quic
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
richardlau authored and targos committed Sep 6, 2021
1 parent 14b4935 commit 9f83d3c
Show file tree
Hide file tree
Showing 139 changed files with 297 additions and 230 deletions.
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Thu Mar 25 15:42:28 2021 UTC"
#define DATE "built on: Tue Aug 24 15:07:53 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Thu Mar 25 15:42:31 2021 UTC"
#define DATE "built on: Tue Aug 24 15:07:57 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Thu Mar 25 15:42:33 2021 UTC"
#define DATE "built on: Tue Aug 24 15:08:02 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Thu Mar 25 15:42:35 2021 UTC"
#define DATE "built on: Tue Aug 24 15:08:04 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Thu Mar 25 15:42:41 2021 UTC"
#define DATE "built on: Tue Aug 24 15:08:15 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Thu Mar 25 15:42:47 2021 UTC"
#define DATE "built on: Tue Aug 24 15:08:26 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55c51430d9f8)",
RANLIB => "CODE(0x55db8a6796f0)",
RC => "rc",
_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" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Thu Mar 25 15:45:00 2021 UTC"
#define DATE "built on: Tue Aug 24 15:12:40 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55ef1e4a36c8)",
RANLIB => "CODE(0x559089244600)",
RC => "rc",
_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" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Thu Mar 25 15:45:03 2021 UTC"
#define DATE "built on: Tue Aug 24 15:12:44 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand All @@ -131,7 +131,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5643c93df2f8)",
RANLIB => "CODE(0x55977bd52240)",
RC => "rc",
_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" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Thu Mar 25 15:45:05 2021 UTC"
#define DATE "built on: Tue Aug 24 15:12:48 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64-ARM",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand All @@ -128,7 +128,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x564e049cb988)",
RANLIB => "CODE(0x559c5faa5ae0)",
RC => "rc",
_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" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: VC-WIN64-ARM"
#define DATE "built on: Thu Mar 25 15:45:06 2021 UTC"
#define DATE "built on: Tue Aug 24 15:12:50 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55a7657f0078)",
RANLIB => "CODE(0x556c966c8ed0)",
RC => "rc",
_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" ],
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",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Thu Mar 25 15:44:47 2021 UTC"
#define DATE "built on: Tue Aug 24 15:12:14 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ $L$ChaCha20_ssse3:
ja NEAR $L$ChaCha20_4x

$L$do_sse3_after_all:
sub rsp,64+40
sub rsp,64+168
movaps XMMWORD[(-40)+r9],xmm6
movaps XMMWORD[(-24)+r9],xmm7
$L$ssse3_body:
Expand Down Expand Up @@ -2378,9 +2378,17 @@ $L$ChaCha20_avx512:
cmp rdx,512
ja NEAR $L$ChaCha20_16x

sub rsp,64+40
movaps XMMWORD[(-40)+r9],xmm6
movaps XMMWORD[(-24)+r9],xmm7
sub rsp,64+168
movaps XMMWORD[(-168)+r9],xmm6
movaps XMMWORD[(-152)+r9],xmm7
movaps XMMWORD[(-136)+r9],xmm8
movaps XMMWORD[(-120)+r9],xmm9
movaps XMMWORD[(-104)+r9],xmm10
movaps XMMWORD[(-88)+r9],xmm11
movaps XMMWORD[(-72)+r9],xmm12
movaps XMMWORD[(-56)+r9],xmm13
movaps XMMWORD[(-40)+r9],xmm14
movaps XMMWORD[(-24)+r9],xmm15
$L$avx512_body:
vbroadcasti32x4 zmm0,ZMMWORD[$L$sigma]
vbroadcasti32x4 zmm1,ZMMWORD[rcx]
Expand Down Expand Up @@ -2560,8 +2568,16 @@ $L$oop_tail_avx512:

$L$done_avx512:
vzeroall
movaps xmm6,XMMWORD[((-40))+r9]
movaps xmm7,XMMWORD[((-24))+r9]
movaps xmm6,XMMWORD[((-168))+r9]
movaps xmm7,XMMWORD[((-152))+r9]
movaps xmm8,XMMWORD[((-136))+r9]
movaps xmm9,XMMWORD[((-120))+r9]
movaps xmm10,XMMWORD[((-104))+r9]
movaps xmm11,XMMWORD[((-88))+r9]
movaps xmm12,XMMWORD[((-72))+r9]
movaps xmm13,XMMWORD[((-56))+r9]
movaps xmm14,XMMWORD[((-40))+r9]
movaps xmm15,XMMWORD[((-24))+r9]
lea rsp,[r9]

$L$avx512_epilogue:
Expand Down Expand Up @@ -2591,9 +2607,17 @@ $L$ChaCha20_avx512vl:
cmp rdx,128
ja NEAR $L$ChaCha20_8xvl

sub rsp,64+40
movaps XMMWORD[(-40)+r9],xmm6
movaps XMMWORD[(-24)+r9],xmm7
sub rsp,64+168
movaps XMMWORD[(-168)+r9],xmm6
movaps XMMWORD[(-152)+r9],xmm7
movaps XMMWORD[(-136)+r9],xmm8
movaps XMMWORD[(-120)+r9],xmm9
movaps XMMWORD[(-104)+r9],xmm10
movaps XMMWORD[(-88)+r9],xmm11
movaps XMMWORD[(-72)+r9],xmm12
movaps XMMWORD[(-56)+r9],xmm13
movaps XMMWORD[(-40)+r9],xmm14
movaps XMMWORD[(-24)+r9],xmm15
$L$avx512vl_body:
vbroadcasti128 ymm0,XMMWORD[$L$sigma]
vbroadcasti128 ymm1,XMMWORD[rcx]
Expand Down Expand Up @@ -2730,8 +2754,16 @@ $L$oop_tail_avx512vl:

$L$done_avx512vl:
vzeroall
movaps xmm6,XMMWORD[((-40))+r9]
movaps xmm7,XMMWORD[((-24))+r9]
movaps xmm6,XMMWORD[((-168))+r9]
movaps xmm7,XMMWORD[((-152))+r9]
movaps xmm8,XMMWORD[((-136))+r9]
movaps xmm9,XMMWORD[((-120))+r9]
movaps xmm10,XMMWORD[((-104))+r9]
movaps xmm11,XMMWORD[((-88))+r9]
movaps xmm12,XMMWORD[((-72))+r9]
movaps xmm13,XMMWORD[((-56))+r9]
movaps xmm14,XMMWORD[((-40))+r9]
movaps xmm15,XMMWORD[((-24))+r9]
lea rsp,[r9]

$L$avx512vl_epilogue:
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1k+quic",
version_num => "0x101010bfL",
version => "1.1.1l+quic",
version_num => "0x101010cfL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55ef6679a0b8)",
RANLIB => "CODE(0x5596a5c60760)",
RC => "rc",
_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" ],
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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Thu Mar 25 15:44:53 2021 UTC"
#define DATE "built on: Tue Aug 24 15:12:26 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Loading

0 comments on commit 9f83d3c

Please sign in to comment.