From 5b422fcfe75112ea3c8a0f063ac2996967457f3b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 22 Feb 2021 21:10:33 +0300 Subject: Release version 1.1.1+13 Upgrade to 1.1.1j --- upstream-build/configdata.pm/i686-linux | 25 ++++++++--------- upstream-build/configdata.pm/i686-win32-mingw32 | 25 ++++++++--------- upstream-build/configdata.pm/i686-win32-msvc | 33 ++++++++++++----------- upstream-build/configdata.pm/x86_64-freebsd | 25 ++++++++--------- upstream-build/configdata.pm/x86_64-linux | 31 ++++++++++----------- upstream-build/configdata.pm/x86_64-macos | 25 ++++++++--------- upstream-build/configdata.pm/x86_64-win32-mingw32 | 25 ++++++++--------- upstream-build/configdata.pm/x86_64-win32-msvc | 31 ++++++++++----------- 8 files changed, 114 insertions(+), 106 deletions(-) (limited to 'upstream-build/configdata.pm') diff --git a/upstream-build/configdata.pm/i686-linux b/upstream-build/configdata.pm/i686-linux index c0b6a4f..5fe5021 100644 --- a/upstream-build/configdata.pm/i686-linux +++ b/upstream-build/configdata.pm/i686-linux @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -10740,9 +10740,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17211,19 +17209,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"; } } diff --git a/upstream-build/configdata.pm/i686-win32-mingw32 b/upstream-build/configdata.pm/i686-win32-mingw32 index 9c8ae3d..e1e5ba8 100644 --- a/upstream-build/configdata.pm/i686-win32-mingw32 +++ b/upstream-build/configdata.pm/i686-win32-mingw32 @@ -111,8 +111,8 @@ our %config = ( sourcedir => "..", target => "mingw", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -10805,9 +10805,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17311,19 +17309,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"; } } diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc index 28d45fb..8d43e8f 100644 --- a/upstream-build/configdata.pm/i686-win32-msvc +++ b/upstream-build/configdata.pm/i686-win32-msvc @@ -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(0xe44e20)", + RANLIB => "CODE(0x2574d00)", 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", @@ -3224,9 +3224,9 @@ our %unified_info = ( { "deps" => [ + "ms\\uplink.o", "ms\\applink.o", "ms\\applink.o", - "ms\\uplink.o", ], "products" => { @@ -3245,8 +3245,6 @@ our %unified_info = ( { "deps" => [ - "ssl\\packet.o", - "ssl\\tls13_enc.o", "ssl\\bio_ssl.o", "ssl\\d1_lib.o", "ssl\\d1_msg.o", @@ -3276,6 +3274,8 @@ our %unified_info = ( "ssl\\t1_trce.o", "ssl\\tls13_enc.o", "ssl\\tls_srp.o", + "ssl\\packet.o", + "ssl\\tls13_enc.o", ], "products" => { @@ -10816,9 +10816,7 @@ our %unified_info = ( "test\\cmactest.o" => [ "include", - "apps\\include", "..\\include", - "..\\apps\\include", ], "test\\cmsapitest.o" => [ @@ -17281,19 +17279,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"; } } diff --git a/upstream-build/configdata.pm/x86_64-freebsd b/upstream-build/configdata.pm/x86_64-freebsd index 33a5d1e..9bdb816 100644 --- a/upstream-build/configdata.pm/x86_64-freebsd +++ b/upstream-build/configdata.pm/x86_64-freebsd @@ -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 = ( @@ -10726,9 +10726,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17191,19 +17189,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"; } } diff --git a/upstream-build/configdata.pm/x86_64-linux b/upstream-build/configdata.pm/x86_64-linux index bfc95f4..bc3fbe9 100644 --- a/upstream-build/configdata.pm/x86_64-linux +++ b/upstream-build/configdata.pm/x86_64-linux @@ -63,7 +63,7 @@ our %config = ( options => "--prefix=/home/karen/install enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib no-asan no-asm no-buildtest-c++ no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-mdc2 no-msan no-sctp no-ssl-trace no-ubsan no-unit-test no-zlib-dynamic", perl_archname => "x86_64-linux-thread-multi", perl_cmd => "/usr/bin/perl", - perl_version => "5.28.2", + perl_version => "5.32.0", perlargv => [ "linux-x86_64", "--prefix=/home/karen/install", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "enable-zlib" ], perlenv => { "AR" => undef, @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -3209,8 +3209,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3240,6 +3238,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { @@ -10741,9 +10741,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17212,19 +17210,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"; } } diff --git a/upstream-build/configdata.pm/x86_64-macos b/upstream-build/configdata.pm/x86_64-macos index 6b5cf94..4b10638 100644 --- a/upstream-build/configdata.pm/x86_64-macos +++ b/upstream-build/configdata.pm/x86_64-macos @@ -111,8 +111,8 @@ our %config = ( sourcedir => "..", target => "darwin64-x86_64-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -10706,9 +10706,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17163,19 +17161,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"; } } diff --git a/upstream-build/configdata.pm/x86_64-win32-mingw32 b/upstream-build/configdata.pm/x86_64-win32-mingw32 index 920591f..3b469b9 100644 --- a/upstream-build/configdata.pm/x86_64-win32-mingw32 +++ b/upstream-build/configdata.pm/x86_64-win32-mingw32 @@ -111,8 +111,8 @@ our %config = ( sourcedir => "..", target => "mingw64", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -10760,9 +10760,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17250,19 +17248,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"; } } diff --git a/upstream-build/configdata.pm/x86_64-win32-msvc b/upstream-build/configdata.pm/x86_64-win32-msvc index eaaa632..302be13 100644 --- a/upstream-build/configdata.pm/x86_64-win32-msvc +++ b/upstream-build/configdata.pm/x86_64-win32-msvc @@ -115,8 +115,8 @@ our %config = ( sourcedir => "..", target => "VC-WIN64A", 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(0xd63ee8)", + RANLIB => "CODE(0xd52910)", RC => "rc", _conf_fname_int => [ "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\00-base-templates.conf", "..\\Configurations\\10-main.conf", "..\\Configurations\\shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c", @@ -10031,12 +10031,12 @@ our %unified_info = ( ], "ms\\applink.o" => [ - "apps", ".", "include", - "..\\apps", + "apps", "..", "..\\include", + "..\\apps", ], "ms\\uplink.o" => [ @@ -10825,9 +10825,7 @@ our %unified_info = ( "test\\cmactest.o" => [ "include", - "apps\\include", "..\\include", - "..\\apps\\include", ], "test\\cmsapitest.o" => [ @@ -17295,19 +17293,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"; } } -- cgit v1.1