Skip to content

Commit d62c650

Browse files
MylesBorinsBethGriggs
MylesBorins
authored and
BethGriggs
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 gen-openssl $ 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: #36521 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent 2de2672 commit d62c650

File tree

235 files changed

+2134
-546
lines changed

Some content is hidden

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

235 files changed

+2134
-546
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 = (
@@ -1172,6 +1172,11 @@ our %unified_info = (
11721172
"libssl",
11731173
"test/libtestutil.a",
11741174
],
1175+
"test/cmactest" =>
1176+
[
1177+
"libcrypto.a",
1178+
"test/libtestutil.a",
1179+
],
11751180
"test/cmsapitest" =>
11761181
[
11771182
"libcrypto",
@@ -8990,6 +8995,11 @@ our %unified_info = (
89908995
[
89918996
"include",
89928997
],
8998+
"test/cmactest.o" =>
8999+
[
9000+
"include",
9001+
"apps/include",
9002+
],
89939003
"test/cmsapitest.o" =>
89949004
[
89959005
"include",
@@ -9567,6 +9577,7 @@ our %unified_info = (
95679577
"test/cipherlist_test",
95689578
"test/ciphername_test",
95699579
"test/clienthellotest",
9580+
"test/cmactest",
95709581
"test/cmsapitest",
95719582
"test/conf_include_test",
95729583
"test/constant_time_test",
@@ -14292,6 +14303,14 @@ our %unified_info = (
1429214303
[
1429314304
"test/clienthellotest.c",
1429414305
],
14306+
"test/cmactest" =>
14307+
[
14308+
"test/cmactest.o",
14309+
],
14310+
"test/cmactest.o" =>
14311+
[
14312+
"test/cmactest.c",
14313+
],
1429514314
"test/cmsapitest" =>
1429614315
[
1429714316
"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: Tue Apr 21 13:28:30 2020 UTC"
14+
#define DATE "built on: Tue Dec 15 03:56:41 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 = (
@@ -1172,6 +1172,11 @@ our %unified_info = (
11721172
"libssl",
11731173
"test/libtestutil.a",
11741174
],
1175+
"test/cmactest" =>
1176+
[
1177+
"libcrypto.a",
1178+
"test/libtestutil.a",
1179+
],
11751180
"test/cmsapitest" =>
11761181
[
11771182
"libcrypto",
@@ -8990,6 +8995,11 @@ our %unified_info = (
89908995
[
89918996
"include",
89928997
],
8998+
"test/cmactest.o" =>
8999+
[
9000+
"include",
9001+
"apps/include",
9002+
],
89939003
"test/cmsapitest.o" =>
89949004
[
89959005
"include",
@@ -9567,6 +9577,7 @@ our %unified_info = (
95679577
"test/cipherlist_test",
95689578
"test/ciphername_test",
95699579
"test/clienthellotest",
9580+
"test/cmactest",
95709581
"test/cmsapitest",
95719582
"test/conf_include_test",
95729583
"test/constant_time_test",
@@ -14292,6 +14303,14 @@ our %unified_info = (
1429214303
[
1429314304
"test/clienthellotest.c",
1429414305
],
14306+
"test/cmactest" =>
14307+
[
14308+
"test/cmactest.o",
14309+
],
14310+
"test/cmactest.o" =>
14311+
[
14312+
"test/cmactest.c",
14313+
],
1429514314
"test/cmsapitest" =>
1429614315
[
1429714316
"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: Tue Apr 21 13:28:32 2020 UTC"
14+
#define DATE "built on: Tue Dec 15 03:57:04 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 = (
@@ -1170,6 +1170,11 @@ our %unified_info = (
11701170
"libssl",
11711171
"test/libtestutil.a",
11721172
],
1173+
"test/cmactest" =>
1174+
[
1175+
"libcrypto.a",
1176+
"test/libtestutil.a",
1177+
],
11731178
"test/cmsapitest" =>
11741179
[
11751180
"libcrypto",
@@ -8910,6 +8915,11 @@ our %unified_info = (
89108915
[
89118916
"include",
89128917
],
8918+
"test/cmactest.o" =>
8919+
[
8920+
"include",
8921+
"apps/include",
8922+
],
89138923
"test/cmsapitest.o" =>
89148924
[
89158925
"include",
@@ -9487,6 +9497,7 @@ our %unified_info = (
94879497
"test/cipherlist_test",
94889498
"test/ciphername_test",
94899499
"test/clienthellotest",
9500+
"test/cmactest",
94909501
"test/cmsapitest",
94919502
"test/conf_include_test",
94929503
"test/constant_time_test",
@@ -14147,6 +14158,14 @@ our %unified_info = (
1414714158
[
1414814159
"test/clienthellotest.c",
1414914160
],
14161+
"test/cmactest" =>
14162+
[
14163+
"test/cmactest.o",
14164+
],
14165+
"test/cmactest.o" =>
14166+
[
14167+
"test/cmactest.c",
14168+
],
1415014169
"test/cmsapitest" =>
1415114170
[
1415214171
"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: Tue Apr 21 13:28:34 2020 UTC"
14+
#define DATE "built on: Tue Dec 15 03:57:28 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 = (
@@ -1181,6 +1181,11 @@ our %unified_info = (
11811181
"libssl",
11821182
"test/libtestutil.a",
11831183
],
1184+
"test/cmactest" =>
1185+
[
1186+
"libcrypto.a",
1187+
"test/libtestutil.a",
1188+
],
11841189
"test/cmsapitest" =>
11851190
[
11861191
"libcrypto",
@@ -9084,6 +9089,11 @@ our %unified_info = (
90849089
[
90859090
"include",
90869091
],
9092+
"test/cmactest.o" =>
9093+
[
9094+
"include",
9095+
"apps/include",
9096+
],
90879097
"test/cmsapitest.o" =>
90889098
[
90899099
"include",
@@ -9661,6 +9671,7 @@ our %unified_info = (
96619671
"test/cipherlist_test",
96629672
"test/ciphername_test",
96639673
"test/clienthellotest",
9674+
"test/cmactest",
96649675
"test/cmsapitest",
96659676
"test/conf_include_test",
96669677
"test/constant_time_test",
@@ -14436,6 +14447,14 @@ our %unified_info = (
1443614447
[
1443714448
"test/clienthellotest.c",
1443814449
],
14450+
"test/cmactest" =>
14451+
[
14452+
"test/cmactest.o",
14453+
],
14454+
"test/cmactest.o" =>
14455+
[
14456+
"test/cmactest.c",
14457+
],
1443914458
"test/cmsapitest" =>
1444014459
[
1444114460
"test/cmsapitest.o",

0 commit comments

Comments
 (0)