Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1k
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: #37916
Fixes: #37913
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
@hassaanp @gengjiawen
hassaanp authored and gengjiawen committed Mar 31, 2021
1 parent 6f2085d commit f638d8d
Show file tree
Hide file tree
Showing 137 changed files with 211 additions and 208 deletions.
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
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 4 14:45:54 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:28 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
View file
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 4 14:45:56 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:31 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
View file
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 4 14:45:59 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:33 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
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 4 14:46:00 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:35 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
View file
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 4 14:46:08 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:41 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
View file
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 4 14:46:16 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:47 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x559dac12ef00)",
RANLIB => "CODE(0x55c51430d9f8)",
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
View file
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 4 14:48:58 2021 UTC"
#define DATE "built on: Thu Mar 25 15:45:00 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x56163e49b440)",
RANLIB => "CODE(0x55ef1e4a36c8)",
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_avx2/crypto/buildinf.h
View file
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 4 14:49:00 2021 UTC"
#define DATE "built on: Thu Mar 25 15:45:03 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -131,7 +131,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55c2ede54b90)",
RANLIB => "CODE(0x5643c93df2f8)",
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
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
View file
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 4 14:49:02 2021 UTC"
#define DATE "built on: Thu Mar 25 15:45:05 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -128,7 +128,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55ac7827a8e0)",
RANLIB => "CODE(0x564e049cb988)",
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
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
View file
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 4 14:49:03 2021 UTC"
#define DATE "built on: Thu Mar 25 15:45:06 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
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55a6ad443640)",
RANLIB => "CODE(0x55a7657f0078)",
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
View file
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 4 14:48:39 2021 UTC"
#define DATE "built on: Thu Mar 25 15:44:47 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_avx2/configdata.pm
View file
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.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x56435f462d50)",
RANLIB => "CODE(0x55ef6679a0b8)",
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_avx2/crypto/buildinf.h
View file
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 4 14:48:48 2021 UTC"
#define DATE "built on: Thu Mar 25 15:44:53 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/no-asm/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55e799b0b810)",
RANLIB => "CODE(0x55f54c2a9d48)",
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/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
View file
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 4 14:48:56 2021 UTC"
#define DATE "built on: Thu Mar 25 15:44:59 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/aix-gcc/asm/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "aix-gcc",
tdirs => [ "ossl_shim" ],
version => "1.1.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

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

#define PLATFORM "platform: aix-gcc"
#define DATE "built on: Thu Mar 4 14:45:39 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:17 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/aix-gcc/asm_avx2/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "aix-gcc",
tdirs => [ "ossl_shim" ],
version => "1.1.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

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

#define PLATFORM "platform: aix-gcc"
#define DATE "built on: Thu Mar 4 14:45:43 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:19 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/aix-gcc/no-asm/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "aix-gcc",
tdirs => [ "ossl_shim" ],
version => "1.1.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

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

#define PLATFORM "platform: aix-gcc"
#define DATE "built on: Thu Mar 4 14:45:46 2021 UTC"
#define DATE "built on: Thu Mar 25 15:42:21 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/aix64-gcc/asm/configdata.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "aix64-gcc",
tdirs => [ "ossl_shim" ],
version => "1.1.1j+quic",
version_num => "0x101010afL",
version => "1.1.1k+quic",
version_num => "0x101010bfL",
);

our %target = (
Expand Down
Loading

0 comments on commit f638d8d

Please sign in to comment.