Skip to content

Commit 0afcb4f

Browse files
danbevrichardlau
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: #37415 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com>
1 parent 447be94 commit 0afcb4f

File tree

185 files changed

+983
-850
lines changed

Some content is hidden

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

185 files changed

+983
-850
lines changed
 

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

+14-12
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ our %config = (
6262
options => " 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-ssl-trace 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-thread-multi",
6464
perl_cmd => "/usr/bin/perl",
65-
perl_version => "5.32.0",
65+
perl_version => "5.30.3",
6666
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "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 = (
@@ -9093,7 +9093,6 @@ our %unified_info = (
90939093
"test/cmactest.o" =>
90949094
[
90959095
"include",
9096-
"apps/include",
90979096
],
90989097
"test/cmsapitest.o" =>
90999098
[
@@ -15430,19 +15429,22 @@ _____
1543015429
}
1543115430
print "\nEnabled features:\n\n";
1543215431
foreach my $what (@disablables) {
15433-
print " $what\n" unless $disabled{$what};
15432+
print " $what\n"
15433+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1543415434
}
1543515435
print "\nDisabled features:\n\n";
1543615436
foreach my $what (@disablables) {
15437-
if ($disabled{$what}) {
15438-
print " $what", ' ' x ($longest - length($what) + 1),
15439-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15440-
print $disabled_info{$what}->{macro}
15441-
if $disabled_info{$what}->{macro};
15437+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15438+
my $what3 = $what2[0];
15439+
if ($what3) {
15440+
print " $what3", ' ' x ($longest - length($what3) + 1),
15441+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15442+
print $disabled_info{$what3}->{macro}
15443+
if $disabled_info{$what3}->{macro};
1544215444
print ' (skip ',
15443-
join(', ', @{$disabled_info{$what}->{skipped}}),
15445+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1544415446
')'
15445-
if $disabled_info{$what}->{skipped};
15447+
if $disabled_info{$what3}->{skipped};
1544615448
print "\n";
1544715449
}
1544815450
}

‎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: Wed Dec 16 14:12:47 2020 UTC"
14+
#define DATE "built on: Wed Feb 17 13:54:49 2021 UTC"
1515

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

0 commit comments

Comments
 (0)
Please sign in to comment.