Skip to content

Commit 2a3ce59

Browse files
danbevBethGriggs
danbev
authored and
BethGriggs
committed
deps: update archs files for OpenSSL-1.1.1j
 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: #37412 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Beth Griggs <[email protected]>
1 parent afbce66 commit 2a3ce59

File tree

145 files changed

+1127
-976
lines changed

Some content is hidden

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

145 files changed

+1127
-976
lines changed

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

+15-13
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
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",
63-
perl_archname => "x86_64-linux-gnu-thread-multi",
63+
perl_archname => "x86_64-linux-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.0",
65+
perl_version => "5.30.3",
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.1i",
115-
version_num => "0x1010109fL",
114+
version => "1.1.1j",
115+
version_num => "0x101010afL",
116116
);
117117

118118
our %target = (
@@ -8998,7 +8998,6 @@ our %unified_info = (
89988998
"test/cmactest.o" =>
89998999
[
90009000
"include",
9001-
"apps/include",
90029001
],
90039002
"test/cmsapitest.o" =>
90049003
[
@@ -15282,19 +15281,22 @@ _____
1528215281
}
1528315282
print "\nEnabled features:\n\n";
1528415283
foreach my $what (@disablables) {
15285-
print " $what\n" unless $disabled{$what};
15284+
print " $what\n"
15285+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1528615286
}
1528715287
print "\nDisabled features:\n\n";
1528815288
foreach my $what (@disablables) {
15289-
if ($disabled{$what}) {
15290-
print " $what", ' ' x ($longest - length($what) + 1),
15291-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15292-
print $disabled_info{$what}->{macro}
15293-
if $disabled_info{$what}->{macro};
15289+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15290+
my $what3 = $what2[0];
15291+
if ($what3) {
15292+
print " $what3", ' ' x ($longest - length($what3) + 1),
15293+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15294+
print $disabled_info{$what3}->{macro}
15295+
if $disabled_info{$what3}->{macro};
1529415296
print ' (skip ',
15295-
join(', ', @{$disabled_info{$what}->{skipped}}),
15297+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1529615298
')'
15297-
if $disabled_info{$what}->{skipped};
15299+
if $disabled_info{$what3}->{skipped};
1529815300
print "\n";
1529915301
}
1530015302
}

Diff for: ‎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: Mon Jan 25 19:01:01 2021 UTC"
14+
#define DATE "built on: Wed Feb 17 12:02:01 2021 UTC"
1515

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

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

+15-13
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
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",
63-
perl_archname => "x86_64-linux-gnu-thread-multi",
63+
perl_archname => "x86_64-linux-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.0",
65+
perl_version => "5.30.3",
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.1i",
115-
version_num => "0x1010109fL",
114+
version => "1.1.1j",
115+
version_num => "0x101010afL",
116116
);
117117

118118
our %target = (
@@ -8998,7 +8998,6 @@ our %unified_info = (
89988998
"test/cmactest.o" =>
89998999
[
90009000
"include",
9001-
"apps/include",
90029001
],
90039002
"test/cmsapitest.o" =>
90049003
[
@@ -15282,19 +15281,22 @@ _____
1528215281
}
1528315282
print "\nEnabled features:\n\n";
1528415283
foreach my $what (@disablables) {
15285-
print " $what\n" unless $disabled{$what};
15284+
print " $what\n"
15285+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1528615286
}
1528715287
print "\nDisabled features:\n\n";
1528815288
foreach my $what (@disablables) {
15289-
if ($disabled{$what}) {
15290-
print " $what", ' ' x ($longest - length($what) + 1),
15291-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15292-
print $disabled_info{$what}->{macro}
15293-
if $disabled_info{$what}->{macro};
15289+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15290+
my $what3 = $what2[0];
15291+
if ($what3) {
15292+
print " $what3", ' ' x ($longest - length($what3) + 1),
15293+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15294+
print $disabled_info{$what3}->{macro}
15295+
if $disabled_info{$what3}->{macro};
1529415296
print ' (skip ',
15295-
join(', ', @{$disabled_info{$what}->{skipped}}),
15297+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1529615298
')'
15297-
if $disabled_info{$what}->{skipped};
15299+
if $disabled_info{$what3}->{skipped};
1529815300
print "\n";
1529915301
}
1530015302
}

Diff for: ‎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: Mon Jan 25 19:01:03 2021 UTC"
14+
#define DATE "built on: Wed Feb 17 12:02:04 2021 UTC"
1515

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

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

+15-13
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ our %config = (
5959
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6060
openssldir => "",
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",
62-
perl_archname => "x86_64-linux-gnu-thread-multi",
62+
perl_archname => "x86_64-linux-thread-multi",
6363
perl_cmd => "/usr/bin/perl",
64-
perl_version => "5.30.0",
64+
perl_version => "5.30.3",
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.1i",
114-
version_num => "0x1010109fL",
113+
version => "1.1.1j",
114+
version_num => "0x101010afL",
115115
);
116116

117117
our %target = (
@@ -8918,7 +8918,6 @@ our %unified_info = (
89188918
"test/cmactest.o" =>
89198919
[
89208920
"include",
8921-
"apps/include",
89228921
],
89238922
"test/cmsapitest.o" =>
89248923
[
@@ -15140,19 +15139,22 @@ _____
1514015139
}
1514115140
print "\nEnabled features:\n\n";
1514215141
foreach my $what (@disablables) {
15143-
print " $what\n" unless $disabled{$what};
15142+
print " $what\n"
15143+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1514415144
}
1514515145
print "\nDisabled features:\n\n";
1514615146
foreach my $what (@disablables) {
15147-
if ($disabled{$what}) {
15148-
print " $what", ' ' x ($longest - length($what) + 1),
15149-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15150-
print $disabled_info{$what}->{macro}
15151-
if $disabled_info{$what}->{macro};
15147+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15148+
my $what3 = $what2[0];
15149+
if ($what3) {
15150+
print " $what3", ' ' x ($longest - length($what3) + 1),
15151+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15152+
print $disabled_info{$what3}->{macro}
15153+
if $disabled_info{$what3}->{macro};
1515215154
print ' (skip ',
15153-
join(', ', @{$disabled_info{$what}->{skipped}}),
15155+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1515415156
')'
15155-
if $disabled_info{$what}->{skipped};
15157+
if $disabled_info{$what3}->{skipped};
1515615158
print "\n";
1515715159
}
1515815160
}

Diff for: ‎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: Mon Jan 25 19:01:05 2021 UTC"
14+
#define DATE "built on: Wed Feb 17 12:02:07 2021 UTC"
1515

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

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

+15-13
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
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",
63-
perl_archname => "x86_64-linux-gnu-thread-multi",
63+
perl_archname => "x86_64-linux-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.0",
65+
perl_version => "5.30.3",
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.1i",
115-
version_num => "0x1010109fL",
114+
version => "1.1.1j",
115+
version_num => "0x101010afL",
116116
);
117117

118118
our %target = (
@@ -9092,7 +9092,6 @@ our %unified_info = (
90929092
"test/cmactest.o" =>
90939093
[
90949094
"include",
9095-
"apps/include",
90969095
],
90979096
"test/cmsapitest.o" =>
90989097
[
@@ -15426,19 +15425,22 @@ _____
1542615425
}
1542715426
print "\nEnabled features:\n\n";
1542815427
foreach my $what (@disablables) {
15429-
print " $what\n" unless $disabled{$what};
15428+
print " $what\n"
15429+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1543015430
}
1543115431
print "\nDisabled features:\n\n";
1543215432
foreach my $what (@disablables) {
15433-
if ($disabled{$what}) {
15434-
print " $what", ' ' x ($longest - length($what) + 1),
15435-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15436-
print $disabled_info{$what}->{macro}
15437-
if $disabled_info{$what}->{macro};
15433+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15434+
my $what3 = $what2[0];
15435+
if ($what3) {
15436+
print " $what3", ' ' x ($longest - length($what3) + 1),
15437+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15438+
print $disabled_info{$what3}->{macro}
15439+
if $disabled_info{$what3}->{macro};
1543815440
print ' (skip ',
15439-
join(', ', @{$disabled_info{$what}->{skipped}}),
15441+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1544015442
')'
15441-
if $disabled_info{$what}->{skipped};
15443+
if $disabled_info{$what3}->{skipped};
1544215444
print "\n";
1544315445
}
1544415446
}

Diff for: ‎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: Mon Jan 25 19:01:06 2021 UTC"
14+
#define DATE "built on: Wed Feb 17 12:02:09 2021 UTC"
1515

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

Diff for: ‎deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm

+15-13
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ our %config = (
6060
openssl_thread_defines => [ "OPENSSL_THREADS" ],
6161
openssldir => "",
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",
63-
perl_archname => "x86_64-linux-gnu-thread-multi",
63+
perl_archname => "x86_64-linux-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.30.0",
65+
perl_version => "5.30.3",
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.1i",
115-
version_num => "0x1010109fL",
114+
version => "1.1.1j",
115+
version_num => "0x101010afL",
116116
);
117117

118118
our %target = (
@@ -9092,7 +9092,6 @@ our %unified_info = (
90929092
"test/cmactest.o" =>
90939093
[
90949094
"include",
9095-
"apps/include",
90969095
],
90979096
"test/cmsapitest.o" =>
90989097
[
@@ -15426,19 +15425,22 @@ _____
1542615425
}
1542715426
print "\nEnabled features:\n\n";
1542815427
foreach my $what (@disablables) {
15429-
print " $what\n" unless $disabled{$what};
15428+
print " $what\n"
15429+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1543015430
}
1543115431
print "\nDisabled features:\n\n";
1543215432
foreach my $what (@disablables) {
15433-
if ($disabled{$what}) {
15434-
print " $what", ' ' x ($longest - length($what) + 1),
15435-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15436-
print $disabled_info{$what}->{macro}
15437-
if $disabled_info{$what}->{macro};
15433+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15434+
my $what3 = $what2[0];
15435+
if ($what3) {
15436+
print " $what3", ' ' x ($longest - length($what3) + 1),
15437+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15438+
print $disabled_info{$what3}->{macro}
15439+
if $disabled_info{$what3}->{macro};
1543815440
print ' (skip ',
15439-
join(', ', @{$disabled_info{$what}->{skipped}}),
15441+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1544015442
')'
15441-
if $disabled_info{$what}->{skipped};
15443+
if $disabled_info{$what3}->{skipped};
1544215444
print "\n";
1544315445
}
1544415446
}

Diff for: ‎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: Mon Jan 25 19:01:10 2021 UTC"
14+
#define DATE "built on: Wed Feb 17 12:02:15 2021 UTC"
1515

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

0 commit comments

Comments
 (0)