Skip to content

Commit b6a31f0

Browse files
MylesBorinstargos
MylesBorins
authored and
targos
committed
deps: update archs files for OpenSSL-1.1.1i
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: #36520 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Beth Griggs <[email protected]>
1 parent 5b49807 commit b6a31f0

File tree

232 files changed

+2134
-471
lines changed

Some content is hidden

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

232 files changed

+2134
-471
lines changed

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

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ our %config = (
6262
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.26.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1g",
115-
version_num => "0x1010107fL",
114+
version => "1.1.1i",
115+
version_num => "0x1010109fL",
116116
);
117117

118118
our %target = (
@@ -1173,6 +1173,11 @@ our %unified_info = (
11731173
"libssl",
11741174
"test/libtestutil.a",
11751175
],
1176+
"test/cmactest" =>
1177+
[
1178+
"libcrypto.a",
1179+
"test/libtestutil.a",
1180+
],
11761181
"test/cmsapitest" =>
11771182
[
11781183
"libcrypto",
@@ -9003,6 +9008,11 @@ our %unified_info = (
90039008
[
90049009
"include",
90059010
],
9011+
"test/cmactest.o" =>
9012+
[
9013+
"include",
9014+
"apps/include",
9015+
],
90069016
"test/cmsapitest.o" =>
90079017
[
90089018
"include",
@@ -9580,6 +9590,7 @@ our %unified_info = (
95809590
"test/cipherlist_test",
95819591
"test/ciphername_test",
95829592
"test/clienthellotest",
9593+
"test/cmactest",
95839594
"test/cmsapitest",
95849595
"test/conf_include_test",
95859596
"test/constant_time_test",
@@ -14315,6 +14326,14 @@ our %unified_info = (
1431514326
[
1431614327
"test/clienthellotest.c",
1431714328
],
14329+
"test/cmactest" =>
14330+
[
14331+
"test/cmactest.o",
14332+
],
14333+
"test/cmactest.o" =>
14334+
[
14335+
"test/cmactest.c",
14336+
],
1431814337
"test/cmsapitest" =>
1431914338
[
1432014339
"test/cmsapitest.o",

‎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 May 7 17:16:44 2020 UTC"
14+
#define DATE "built on: Tue Dec 15 02:48:28 2020 UTC"
1515

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

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/opensslconf.h.in
44
*
5-
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -114,6 +114,11 @@ extern "C" {
114114
# undef DECLARE_DEPRECATED
115115
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
116116
# endif
117+
# elif defined(__SUNPRO_C)
118+
# if (__SUNPRO_C >= 0x5130)
119+
# undef DECLARE_DEPRECATED
120+
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
121+
# endif
117122
# endif
118123
#endif
119124

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

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ our %config = (
6262
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.26.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1g",
115-
version_num => "0x1010107fL",
114+
version => "1.1.1i",
115+
version_num => "0x1010109fL",
116116
);
117117

118118
our %target = (
@@ -1173,6 +1173,11 @@ our %unified_info = (
11731173
"libssl",
11741174
"test/libtestutil.a",
11751175
],
1176+
"test/cmactest" =>
1177+
[
1178+
"libcrypto.a",
1179+
"test/libtestutil.a",
1180+
],
11761181
"test/cmsapitest" =>
11771182
[
11781183
"libcrypto",
@@ -9003,6 +9008,11 @@ our %unified_info = (
90039008
[
90049009
"include",
90059010
],
9011+
"test/cmactest.o" =>
9012+
[
9013+
"include",
9014+
"apps/include",
9015+
],
90069016
"test/cmsapitest.o" =>
90079017
[
90089018
"include",
@@ -9580,6 +9590,7 @@ our %unified_info = (
95809590
"test/cipherlist_test",
95819591
"test/ciphername_test",
95829592
"test/clienthellotest",
9593+
"test/cmactest",
95839594
"test/cmsapitest",
95849595
"test/conf_include_test",
95859596
"test/constant_time_test",
@@ -14315,6 +14326,14 @@ our %unified_info = (
1431514326
[
1431614327
"test/clienthellotest.c",
1431714328
],
14329+
"test/cmactest" =>
14330+
[
14331+
"test/cmactest.o",
14332+
],
14333+
"test/cmactest.o" =>
14334+
[
14335+
"test/cmactest.c",
14336+
],
1431814337
"test/cmsapitest" =>
1431914338
[
1432014339
"test/cmsapitest.o",

‎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 May 7 17:16:49 2020 UTC"
14+
#define DATE "built on: Tue Dec 15 02:48:50 2020 UTC"
1515

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

‎deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/opensslconf.h.in
44
*
5-
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -114,6 +114,11 @@ extern "C" {
114114
# undef DECLARE_DEPRECATED
115115
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
116116
# endif
117+
# elif defined(__SUNPRO_C)
118+
# if (__SUNPRO_C >= 0x5130)
119+
# undef DECLARE_DEPRECATED
120+
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
121+
# endif
117122
# endif
118123
#endif
119124

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

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ our %config = (
6161
options => "enable-ssl-trace no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6262
perl_archname => "x86_64-linux-gnu-thread-multi",
6363
perl_cmd => "/usr/bin/perl",
64-
perl_version => "5.26.1",
64+
perl_version => "5.30.0",
6565
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "no-asm", "BSD-x86" ],
6666
perlenv => {
6767
"AR" => undef,
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86",
112112
tdirs => [ "ossl_shim" ],
113-
version => "1.1.1g",
114-
version_num => "0x1010107fL",
113+
version => "1.1.1i",
114+
version_num => "0x1010109fL",
115115
);
116116

117117
our %target = (
@@ -1171,6 +1171,11 @@ our %unified_info = (
11711171
"libssl",
11721172
"test/libtestutil.a",
11731173
],
1174+
"test/cmactest" =>
1175+
[
1176+
"libcrypto.a",
1177+
"test/libtestutil.a",
1178+
],
11741179
"test/cmsapitest" =>
11751180
[
11761181
"libcrypto",
@@ -8923,6 +8928,11 @@ our %unified_info = (
89238928
[
89248929
"include",
89258930
],
8931+
"test/cmactest.o" =>
8932+
[
8933+
"include",
8934+
"apps/include",
8935+
],
89268936
"test/cmsapitest.o" =>
89278937
[
89288938
"include",
@@ -9500,6 +9510,7 @@ our %unified_info = (
95009510
"test/cipherlist_test",
95019511
"test/ciphername_test",
95029512
"test/clienthellotest",
9513+
"test/cmactest",
95039514
"test/cmsapitest",
95049515
"test/conf_include_test",
95059516
"test/constant_time_test",
@@ -14170,6 +14181,14 @@ our %unified_info = (
1417014181
[
1417114182
"test/clienthellotest.c",
1417214183
],
14184+
"test/cmactest" =>
14185+
[
14186+
"test/cmactest.o",
14187+
],
14188+
"test/cmactest.o" =>
14189+
[
14190+
"test/cmactest.c",
14191+
],
1417314192
"test/cmsapitest" =>
1417414193
[
1417514194
"test/cmsapitest.o",

‎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 May 7 17:16:53 2020 UTC"
14+
#define DATE "built on: Tue Dec 15 02:49:13 2020 UTC"
1515

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

‎deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/opensslconf.h.in
44
*
5-
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -117,6 +117,11 @@ extern "C" {
117117
# undef DECLARE_DEPRECATED
118118
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
119119
# endif
120+
# elif defined(__SUNPRO_C)
121+
# if (__SUNPRO_C >= 0x5130)
122+
# undef DECLARE_DEPRECATED
123+
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
124+
# endif
120125
# endif
121126
#endif
122127

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

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ our %config = (
6262
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
6363
perl_archname => "x86_64-linux-gnu-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.26.1",
65+
perl_version => "5.30.0",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86_64" ],
6767
perlenv => {
6868
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
111111
sourcedir => ".",
112112
target => "BSD-x86_64",
113113
tdirs => [ "ossl_shim" ],
114-
version => "1.1.1g",
115-
version_num => "0x1010107fL",
114+
version => "1.1.1i",
115+
version_num => "0x1010109fL",
116116
);
117117

118118
our %target = (
@@ -1182,6 +1182,11 @@ our %unified_info = (
11821182
"libssl",
11831183
"test/libtestutil.a",
11841184
],
1185+
"test/cmactest" =>
1186+
[
1187+
"libcrypto.a",
1188+
"test/libtestutil.a",
1189+
],
11851190
"test/cmsapitest" =>
11861191
[
11871192
"libcrypto",
@@ -9097,6 +9102,11 @@ our %unified_info = (
90979102
[
90989103
"include",
90999104
],
9105+
"test/cmactest.o" =>
9106+
[
9107+
"include",
9108+
"apps/include",
9109+
],
91009110
"test/cmsapitest.o" =>
91019111
[
91029112
"include",
@@ -9674,6 +9684,7 @@ our %unified_info = (
96749684
"test/cipherlist_test",
96759685
"test/ciphername_test",
96769686
"test/clienthellotest",
9687+
"test/cmactest",
96779688
"test/cmsapitest",
96789689
"test/conf_include_test",
96799690
"test/constant_time_test",
@@ -14459,6 +14470,14 @@ our %unified_info = (
1445914470
[
1446014471
"test/clienthellotest.c",
1446114472
],
14473+
"test/cmactest" =>
14474+
[
14475+
"test/cmactest.o",
14476+
],
14477+
"test/cmactest.o" =>
14478+
[
14479+
"test/cmactest.c",
14480+
],
1446214481
"test/cmsapitest" =>
1446314482
[
1446414483
"test/cmsapitest.o",

0 commit comments

Comments
 (0)