Skip to content

Commit 313d268

Browse files
danbevBethGriggs
authored andcommittedFeb 22, 2021
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 Backport-PR-URL: #37413 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com>
1 parent 6098012 commit 313d268

File tree

362 files changed

+3778
-3607
lines changed

Some content is hidden

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

362 files changed

+3778
-3607
lines changed
 

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

+16-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
}
@@ -15467,3 +15469,4 @@ Verbose output.
1546715469
=back
1546815470
1546915471
=cut
15472+

0 commit comments

Comments
 (0)