Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v10.x] Update openssl to 1.1.1j #37415

Closed
wants to merge 2 commits into from
+1,812 −1,169
Closed

[v10.x] Update openssl to 1.1.1j #37415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b89edf
deps: upgrade openssl sources to 1.1.1j
danbev Feb 17, 2021
9b08f61
deps: update archs files for OpenSSL-1.1.1j
danbev Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ our %config = (
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",
perl_archname => "x86_64-linux-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.32.0",
perl_version => "5.30.3",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "BSD-x86_64" ],
perlenv => {
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1i",
version_num => "0x1010109fL",
version => "1.1.1j",
version_num => "0x101010afL",
);

our %target = (
@@ -9093,7 +9093,6 @@ our %unified_info = (
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
@@ -15430,19 +15429,22 @@ _____
}
print "\nEnabled features:\n\n";
foreach my $what (@disablables) {
print " $what\n" unless $disabled{$what};
print " $what\n"
unless grep { $_ =~ /^${what}$/ } keys %disabled;
}
print "\nDisabled features:\n\n";
foreach my $what (@disablables) {
if ($disabled{$what}) {
print " $what", ' ' x ($longest - length($what) + 1),
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
print $disabled_info{$what}->{macro}
if $disabled_info{$what}->{macro};
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
my $what3 = $what2[0];
if ($what3) {
print " $what3", ' ' x ($longest - length($what3) + 1),
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
print $disabled_info{$what3}->{macro}
if $disabled_info{$what3}->{macro};
print ' (skip ',
join(', ', @{$disabled_info{$what}->{skipped}}),
join(', ', @{$disabled_info{$what3}->{skipped}}),
')'
if $disabled_info{$what}->{skipped};
if $disabled_info{$what3}->{skipped};
print "\n";
}
}
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Dec 16 14:12:47 2020 UTC"
#define DATE "built on: Wed Feb 17 13:54:49 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
26 changes: 14 additions & 12 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ our %config = (
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",
perl_archname => "x86_64-linux-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.32.0",
perl_version => "5.30.3",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "BSD-x86_64" ],
perlenv => {
"AR" => undef,
@@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1i",
version_num => "0x1010109fL",
version => "1.1.1j",
version_num => "0x101010afL",
);

our %target = (
@@ -9093,7 +9093,6 @@ our %unified_info = (
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
@@ -15430,19 +15429,22 @@ _____
}
print "\nEnabled features:\n\n";
foreach my $what (@disablables) {
print " $what\n" unless $disabled{$what};
print " $what\n"
unless grep { $_ =~ /^${what}$/ } keys %disabled;
}
print "\nDisabled features:\n\n";
foreach my $what (@disablables) {
if ($disabled{$what}) {
print " $what", ' ' x ($longest - length($what) + 1),
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
print $disabled_info{$what}->{macro}
if $disabled_info{$what}->{macro};
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
my $what3 = $what2[0];
if ($what3) {
print " $what3", ' ' x ($longest - length($what3) + 1),
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
print $disabled_info{$what3}->{macro}
if $disabled_info{$what3}->{macro};
print ' (skip ',
join(', ', @{$disabled_info{$what}->{skipped}}),
join(', ', @{$disabled_info{$what3}->{skipped}}),
')'
if $disabled_info{$what}->{skipped};
if $disabled_info{$what3}->{skipped};
print "\n";
}
}
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Dec 16 14:12:56 2020 UTC"
#define DATE "built on: Wed Feb 17 13:54:56 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
26 changes: 14 additions & 12 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ our %config = (
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",
perl_archname => "x86_64-linux-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.32.0",
perl_version => "5.30.3",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "no-asm", "BSD-x86_64" ],
perlenv => {
"AR" => undef,
@@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1i",
version_num => "0x1010109fL",
version => "1.1.1j",
version_num => "0x101010afL",
);

our %target = (
@@ -8940,7 +8940,6 @@ our %unified_info = (
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
@@ -15165,19 +15164,22 @@ _____
}
print "\nEnabled features:\n\n";
foreach my $what (@disablables) {
print " $what\n" unless $disabled{$what};
print " $what\n"
unless grep { $_ =~ /^${what}$/ } keys %disabled;
}
print "\nDisabled features:\n\n";
foreach my $what (@disablables) {
if ($disabled{$what}) {
print " $what", ' ' x ($longest - length($what) + 1),
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
print $disabled_info{$what}->{macro}
if $disabled_info{$what}->{macro};
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
my $what3 = $what2[0];
if ($what3) {
print " $what3", ' ' x ($longest - length($what3) + 1),
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
print $disabled_info{$what3}->{macro}
if $disabled_info{$what3}->{macro};
print ' (skip ',
join(', ', @{$disabled_info{$what}->{skipped}}),
join(', ', @{$disabled_info{$what3}->{skipped}}),
')'
if $disabled_info{$what}->{skipped};
if $disabled_info{$what3}->{skipped};
print "\n";
}
}
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Dec 16 14:13:03 2020 UTC"
#define DATE "built on: Wed Feb 17 13:55:02 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
28 changes: 15 additions & 13 deletions deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ our %config = (
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",
perl_archname => "x86_64-linux-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.32.0",
perl_version => "5.30.3",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "VC-WIN32" ],
perlenv => {
"AR" => undef,
@@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1i",
version_num => "0x1010109fL",
version => "1.1.1j",
version_num => "0x101010afL",
);

our %target = (
@@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5644d1a7a3d0)",
RANLIB => "CODE(0x56078271fdc8)",
RC => "rc",
_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" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
@@ -9046,7 +9046,6 @@ our %unified_info = (
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
@@ -15305,19 +15304,22 @@ _____
}
print "\nEnabled features:\n\n";
foreach my $what (@disablables) {
print " $what\n" unless $disabled{$what};
print " $what\n"
unless grep { $_ =~ /^${what}$/ } keys %disabled;
}
print "\nDisabled features:\n\n";
foreach my $what (@disablables) {
if ($disabled{$what}) {
print " $what", ' ' x ($longest - length($what) + 1),
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
print $disabled_info{$what}->{macro}
if $disabled_info{$what}->{macro};
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
my $what3 = $what2[0];
if ($what3) {
print " $what3", ' ' x ($longest - length($what3) + 1),
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
print $disabled_info{$what3}->{macro}
if $disabled_info{$what3}->{macro};
print ' (skip ',
join(', ', @{$disabled_info{$what}->{skipped}}),
join(', ', @{$disabled_info{$what3}->{skipped}}),
')'
if $disabled_info{$what}->{skipped};
if $disabled_info{$what3}->{skipped};
print "\n";
}
}
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Dec 16 14:16:44 2020 UTC"
#define DATE "built on: Wed Feb 17 13:57:49 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/include/progs.h
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
28 changes: 15 additions & 13 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ our %config = (
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",
perl_archname => "x86_64-linux-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.32.0",
perl_version => "5.30.3",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "VC-WIN32" ],
perlenv => {
"AR" => undef,
@@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1i",
version_num => "0x1010109fL",
version => "1.1.1j",
version_num => "0x101010afL",
);

our %target = (
@@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x555c4c7e7340)",
RANLIB => "CODE(0x55b8e2a36798)",
RC => "rc",
_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" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
@@ -9046,7 +9046,6 @@ our %unified_info = (
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
@@ -15305,19 +15304,22 @@ _____
}
print "\nEnabled features:\n\n";
foreach my $what (@disablables) {
print " $what\n" unless $disabled{$what};
print " $what\n"
unless grep { $_ =~ /^${what}$/ } keys %disabled;
}
print "\nDisabled features:\n\n";
foreach my $what (@disablables) {
if ($disabled{$what}) {
print " $what", ' ' x ($longest - length($what) + 1),
"[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
print $disabled_info{$what}->{macro}
if $disabled_info{$what}->{macro};
my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled;
my $what3 = $what2[0];
if ($what3) {
print " $what3", ' ' x ($longest - length($what3) + 1),
"[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1);
print $disabled_info{$what3}->{macro}
if $disabled_info{$what3}->{macro};
print ' (skip ',
join(', ', @{$disabled_info{$what}->{skipped}}),
join(', ', @{$disabled_info{$what3}->{skipped}}),
')'
if $disabled_info{$what}->{skipped};
if $disabled_info{$what3}->{skipped};
print "\n";
}
}
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Dec 16 14:16:48 2020 UTC"
#define DATE "built on: Wed Feb 17 13:57:54 2021 UTC"

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