Skip to content

Commit 3089326

Browse files
richardlaurichardlau
committed
deps: update archs files for OpenSSL-1.1.1m
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>
1 parent 59da7c1 commit 3089326

File tree

139 files changed

+286
-208
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

+286
-208
lines changed

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

+3-2
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.1l",
115-
version_num => "0x101010cfL",
114+
version => "1.1.1m",
115+
version_num => "0x101010dfL",
116116
);
117117

118118
our %target = (
@@ -1272,6 +1272,7 @@ our %unified_info = (
12721272
],
12731273
"test/ec_internal_test" =>
12741274
[
1275+
"apps/libapps.a",
12751276
"libcrypto.a",
12761277
"test/libtestutil.a",
12771278
],

‎deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:23:09 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:32:59 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

+3-2
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.1l",
115-
version_num => "0x101010cfL",
114+
version => "1.1.1m",
115+
version_num => "0x101010dfL",
116116
);
117117

118118
our %target = (
@@ -1272,6 +1272,7 @@ our %unified_info = (
12721272
],
12731273
"test/ec_internal_test" =>
12741274
[
1275+
"apps/libapps.a",
12751276
"libcrypto.a",
12761277
"test/libtestutil.a",
12771278
],

‎deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:23:13 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:33:03 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

+3-2
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.1l",
114-
version_num => "0x101010cfL",
113+
version => "1.1.1m",
114+
version_num => "0x101010dfL",
115115
);
116116

117117
our %target = (
@@ -1270,6 +1270,7 @@ our %unified_info = (
12701270
],
12711271
"test/ec_internal_test" =>
12721272
[
1273+
"apps/libapps.a",
12731274
"libcrypto.a",
12741275
"test/libtestutil.a",
12751276
],

‎deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:23:17 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:33:07 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

+3-2
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.1l",
115-
version_num => "0x101010cfL",
114+
version => "1.1.1m",
115+
version_num => "0x101010dfL",
116116
);
117117

118118
our %target = (
@@ -1281,6 +1281,7 @@ our %unified_info = (
12811281
],
12821282
"test/ec_internal_test" =>
12831283
[
1284+
"apps/libapps.a",
12841285
"libcrypto.a",
12851286
"test/libtestutil.a",
12861287
],

‎deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:23:20 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:33:10 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

+3-2
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.1l",
115-
version_num => "0x101010cfL",
114+
version => "1.1.1m",
115+
version_num => "0x101010dfL",
116116
);
117117

118118
our %target = (
@@ -1281,6 +1281,7 @@ our %unified_info = (
12811281
],
12821282
"test/ec_internal_test" =>
12831283
[
1284+
"apps/libapps.a",
12841285
"libcrypto.a",
12851286
"test/libtestutil.a",
12861287
],

‎deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:23:31 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:33:21 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

+3-2
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.1l",
114-
version_num => "0x101010cfL",
113+
version => "1.1.1m",
114+
version_num => "0x101010dfL",
115115
);
116116

117117
our %target = (
@@ -1279,6 +1279,7 @@ our %unified_info = (
12791279
],
12801280
"test/ec_internal_test" =>
12811281
[
1282+
"apps/libapps.a",
12821283
"libcrypto.a",
12831284
"test/libtestutil.a",
12841285
],

‎deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:23:41 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:33:32 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

+4-3
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.1l",
119-
version_num => "0x101010cfL",
118+
version => "1.1.1m",
119+
version_num => "0x101010dfL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x55d0f13617a0)",
135+
RANLIB => "CODE(0x55d2da2ee600)",
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",
@@ -1303,6 +1303,7 @@ our %unified_info = (
13031303
],
13041304
"test/ec_internal_test" =>
13051305
[
1306+
"apps/libapps.a",
13061307
"libcrypto.a",
13071308
"test/libtestutil.a",
13081309
],

‎deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: "
14-
#define DATE "built on: Tue Aug 24 18:27:46 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:37:38 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

+4-3
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.1l",
119-
version_num => "0x101010cfL",
118+
version => "1.1.1m",
119+
version_num => "0x101010dfL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x55fa0ac2a100)",
135+
RANLIB => "CODE(0x556a6c58b940)",
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",
@@ -1303,6 +1303,7 @@ our %unified_info = (
13031303
],
13041304
"test/ec_internal_test" =>
13051305
[
1306+
"apps/libapps.a",
13061307
"libcrypto.a",
13071308
"test/libtestutil.a",
13081309
],

‎deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: "
14-
#define DATE "built on: Tue Aug 24 18:27:50 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:37:42 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

+4-3
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.1l",
118-
version_num => "0x101010cfL",
117+
version => "1.1.1m",
118+
version_num => "0x101010dfL",
119119
);
120120

121121
our %target = (
@@ -131,7 +131,7 @@ our %target = (
131131
LDFLAGS => "/nologo /debug",
132132
MT => "mt",
133133
MTFLAGS => "-nologo",
134-
RANLIB => "CODE(0x55bb7103b260)",
134+
RANLIB => "CODE(0x5646c0ead300)",
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",
@@ -1301,6 +1301,7 @@ our %unified_info = (
13011301
],
13021302
"test/ec_internal_test" =>
13031303
[
1304+
"apps/libapps.a",
13041305
"libcrypto.a",
13051306
"test/libtestutil.a",
13061307
],

‎deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: "
14-
#define DATE "built on: Tue Aug 24 18:27:54 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:37:46 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

+4-3
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.1l",
117-
version_num => "0x101010cfL",
116+
version => "1.1.1m",
117+
version_num => "0x101010dfL",
118118
);
119119

120120
our %target = (
@@ -128,7 +128,7 @@ our %target = (
128128
LDFLAGS => "/nologo /debug",
129129
MT => "mt",
130130
MTFLAGS => "-nologo",
131-
RANLIB => "CODE(0x558808b30be0)",
131+
RANLIB => "CODE(0x56452016c220)",
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",
@@ -1295,6 +1295,7 @@ our %unified_info = (
12951295
],
12961296
"test/ec_internal_test" =>
12971297
[
1298+
"apps/libapps.a",
12981299
"libcrypto.a",
12991300
"test/libtestutil.a",
13001301
],

‎deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h

+1-1
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: Tue Aug 24 18:27:56 2021 UTC"
14+
#define DATE "built on: Tue Dec 14 17:37:49 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

+4-3
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.1l",
120-
version_num => "0x101010cfL",
119+
version => "1.1.1m",
120+
version_num => "0x101010dfL",
121121
);
122122

123123
our %target = (
@@ -133,7 +133,7 @@ our %target = (
133133
LDFLAGS => "/nologo /debug",
134134
MT => "mt",
135135
MTFLAGS => "-nologo",
136-
RANLIB => "CODE(0x559ec8caa640)",
136+
RANLIB => "CODE(0x564e293545d0)",
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",
@@ -1305,6 +1305,7 @@ our %unified_info = (
13051305
],
13061306
"test/ec_internal_test" =>
13071307
[
1308+
"apps/libapps.a",
13081309
"libcrypto.a",
13091310
"test/libtestutil.a",
13101311
],

‎deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

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

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

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

+4-3
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.1l",
120-
version_num => "0x101010cfL",
119+
version => "1.1.1m",
120+
version_num => "0x101010dfL",
121121
);
122122

123123
our %target = (
@@ -133,7 +133,7 @@ our %target = (
133133
LDFLAGS => "/nologo /debug",
134134
MT => "mt",
135135
MTFLAGS => "-nologo",
136-
RANLIB => "CODE(0x56254ccecb20)",
136+
RANLIB => "CODE(0x55d033ffce50)",
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",
@@ -1305,6 +1305,7 @@ our %unified_info = (
13051305
],
13061306
"test/ec_internal_test" =>
13071307
[
1308+
"apps/libapps.a",
13081309
"libcrypto.a",
13091310
"test/libtestutil.a",
13101311
],

‎deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

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

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

0 commit comments

Comments
 (0)