Skip to content

Commit 0afcb4f

Browse files
danbevrichardlau
danbev
authored and
richardlau
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: #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‎

Lines changed: 14 additions & 12 deletions
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‎

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_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

‎deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2021 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

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

Lines changed: 14 additions & 12 deletions
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_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_64"
14-
#define DATE "built on: Wed Dec 16 14:12:56 2020 UTC"
14+
#define DATE "built on: Wed Feb 17 13:54:56 2021 UTC"
1515

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

‎deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2021 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

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ our %config = (
6161
options => " 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-ssl-trace 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-thread-multi",
6363
perl_cmd => "/usr/bin/perl",
64-
perl_version => "5.32.0",
64+
perl_version => "5.30.3",
6565
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "no-asm", "BSD-x86_64" ],
6666
perlenv => {
6767
"AR" => undef,
@@ -110,8 +110,8 @@ our %config = (
110110
sourcedir => ".",
111111
target => "BSD-x86_64",
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 = (
@@ -8940,7 +8940,6 @@ our %unified_info = (
89408940
"test/cmactest.o" =>
89418941
[
89428942
"include",
8943-
"apps/include",
89448943
],
89458944
"test/cmsapitest.o" =>
89468945
[
@@ -15165,19 +15164,22 @@ _____
1516515164
}
1516615165
print "\nEnabled features:\n\n";
1516715166
foreach my $what (@disablables) {
15168-
print " $what\n" unless $disabled{$what};
15167+
print " $what\n"
15168+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1516915169
}
1517015170
print "\nDisabled features:\n\n";
1517115171
foreach my $what (@disablables) {
15172-
if ($disabled{$what}) {
15173-
print " $what", ' ' x ($longest - length($what) + 1),
15174-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15175-
print $disabled_info{$what}->{macro}
15176-
if $disabled_info{$what}->{macro};
15172+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15173+
my $what3 = $what2[0];
15174+
if ($what3) {
15175+
print " $what3", ' ' x ($longest - length($what3) + 1),
15176+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15177+
print $disabled_info{$what3}->{macro}
15178+
if $disabled_info{$what3}->{macro};
1517715179
print ' (skip ',
15178-
join(', ', @{$disabled_info{$what}->{skipped}}),
15180+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1517915181
')'
15180-
if $disabled_info{$what}->{skipped};
15182+
if $disabled_info{$what3}->{skipped};
1518115183
print "\n";
1518215184
}
1518315185
}

‎deps/openssl/config/archs/BSD-x86_64/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_64"
14-
#define DATE "built on: Wed Dec 16 14:13:03 2020 UTC"
14+
#define DATE "built on: Wed Feb 17 13:55:02 2021 UTC"
1515

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

‎deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2021 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

‎deps/openssl/config/archs/VC-WIN32/asm/configdata.pm‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ our %config = (
6666
options => " no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng 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",
6767
perl_archname => "x86_64-linux-thread-multi",
6868
perl_cmd => "/usr/bin/perl",
69-
perl_version => "5.32.0",
69+
perl_version => "5.30.3",
7070
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "VC-WIN32" ],
7171
perlenv => {
7272
"AR" => undef,
@@ -115,8 +115,8 @@ our %config = (
115115
sourcedir => ".",
116116
target => "VC-WIN32",
117117
tdirs => [ "ossl_shim" ],
118-
version => "1.1.1i",
119-
version_num => "0x1010109fL",
118+
version => "1.1.1j",
119+
version_num => "0x101010afL",
120120
);
121121

122122
our %target = (
@@ -132,7 +132,7 @@ our %target = (
132132
LDFLAGS => "/nologo /debug",
133133
MT => "mt",
134134
MTFLAGS => "-nologo",
135-
RANLIB => "CODE(0x5644d1a7a3d0)",
135+
RANLIB => "CODE(0x56078271fdc8)",
136136
RC => "rc",
137137
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
138138
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
@@ -9046,7 +9046,6 @@ our %unified_info = (
90469046
"test/cmactest.o" =>
90479047
[
90489048
"include",
9049-
"apps/include",
90509049
],
90519050
"test/cmsapitest.o" =>
90529051
[
@@ -15305,19 +15304,22 @@ _____
1530515304
}
1530615305
print "\nEnabled features:\n\n";
1530715306
foreach my $what (@disablables) {
15308-
print " $what\n" unless $disabled{$what};
15307+
print " $what\n"
15308+
unless grep { $_ =~ /^${what}$/ } keys %disabled;
1530915309
}
1531015310
print "\nDisabled features:\n\n";
1531115311
foreach my $what (@disablables) {
15312-
if ($disabled{$what}) {
15313-
print " $what", ' ' x ($longest - length($what) + 1),
15314-
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
15315-
print $disabled_info{$what}->{macro}
15316-
if $disabled_info{$what}->{macro};
15312+
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
15313+
my $what3 = $what2[0];
15314+
if ($what3) {
15315+
print " $what3", ' ' x ($longest - length($what3) + 1),
15316+
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
15317+
print $disabled_info{$what3}->{macro}
15318+
if $disabled_info{$what3}->{macro};
1531715319
print ' (skip ',
15318-
join(', ', @{$disabled_info{$what}->{skipped}}),
15320+
join(', ', @{$disabled_info{$what3}->{skipped}}),
1531915321
')'
15320-
if $disabled_info{$what}->{skipped};
15322+
if $disabled_info{$what3}->{skipped};
1532115323
print "\n";
1532215324
}
1532315325
}

0 commit comments

Comments
 (0)