Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1m
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: #41173
Refs: https://mta.openssl.org/pipermail/openssl-announce/2021-December/000211.html
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Derek Lewis <DerekNonGeneric@inf.is>
  • Loading branch information
@richardlau
richardlau committed Jan 14, 2022
1 parent 59da7c1 commit 3089326
Show file tree
Hide file tree
Showing 139 changed files with 286 additions and 208 deletions.
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1l",
version_num => "0x101010cfL",
version => "1.1.1m",
version_num => "0x101010dfL",
);

our %target = (
Expand Down Expand Up @@ -1272,6 +1272,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Aug 24 18:23:09 2021 UTC"
#define DATE "built on: Tue Dec 14 17:32:59 2021 UTC"

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

our %target = (
Expand Down Expand Up @@ -1272,6 +1272,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Aug 24 18:23:13 2021 UTC"
#define DATE "built on: Tue Dec 14 17:33:03 2021 UTC"

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

our %target = (
Expand Down Expand Up @@ -1270,6 +1270,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Aug 24 18:23:17 2021 UTC"
#define DATE "built on: Tue Dec 14 17:33:07 2021 UTC"

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

our %target = (
Expand Down Expand Up @@ -1281,6 +1281,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Aug 24 18:23:20 2021 UTC"
#define DATE "built on: Tue Dec 14 17:33:10 2021 UTC"

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

our %target = (
Expand Down Expand Up @@ -1281,6 +1281,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Aug 24 18:23:31 2021 UTC"
#define DATE "built on: Tue Dec 14 17:33:21 2021 UTC"

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

our %target = (
Expand Down Expand Up @@ -1279,6 +1279,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Aug 24 18:23:41 2021 UTC"
#define DATE "built on: Tue Dec 14 17:33:32 2021 UTC"

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

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55d0f13617a0)",
RANLIB => "CODE(0x55d2da2ee600)",
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 Expand Up @@ -1303,6 +1303,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Aug 24 18:27:46 2021 UTC"
#define DATE "built on: Tue Dec 14 17:37:38 2021 UTC"

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

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55fa0ac2a100)",
RANLIB => "CODE(0x556a6c58b940)",
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 Expand Up @@ -1303,6 +1303,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Aug 24 18:27:50 2021 UTC"
#define DATE "built on: Tue Dec 14 17:37:42 2021 UTC"

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

our %target = (
Expand All @@ -131,7 +131,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55bb7103b260)",
RANLIB => "CODE(0x5646c0ead300)",
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 Expand Up @@ -1301,6 +1301,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Aug 24 18:27:54 2021 UTC"
#define DATE "built on: Tue Dec 14 17:37:46 2021 UTC"

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

our %target = (
Expand All @@ -128,7 +128,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x558808b30be0)",
RANLIB => "CODE(0x56452016c220)",
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 Expand Up @@ -1295,6 +1295,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: VC-WIN64-ARM"
#define DATE "built on: Tue Aug 24 18:27:56 2021 UTC"
#define DATE "built on: Tue Dec 14 17:37:49 2021 UTC"

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

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x559ec8caa640)",
RANLIB => "CODE(0x564e293545d0)",
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 Expand Up @@ -1305,6 +1305,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Aug 24 18:27:20 2021 UTC"
#define DATE "built on: Tue Dec 14 17:37:12 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
View file
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1l",
version_num => "0x101010cfL",
version => "1.1.1m",
version_num => "0x101010dfL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x56254ccecb20)",
RANLIB => "CODE(0x55d033ffce50)",
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 Expand Up @@ -1305,6 +1305,7 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Aug 24 18:27:31 2021 UTC"
#define DATE "built on: Tue Dec 14 17:37:24 2021 UTC"

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

0 comments on commit 3089326

Please sign in to comment.