From 84d7a4b26e733925e287185bb2f03feb6fb0811d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 25 Nov 2019 18:44:47 +0300 Subject: Release version 1.1.1+6 Upgrade to 1.1.1d --- upstream-build/configdata.pm/i686-linux | 19 +++++++++++--- upstream-build/configdata.pm/i686-win32-mingw32 | 21 ++++++++++++---- upstream-build/configdata.pm/i686-win32-msvc | 24 +++++++++++++----- upstream-build/configdata.pm/x86_64-freebsd | 19 +++++++++++--- upstream-build/configdata.pm/x86_64-linux | 25 +++++++++++++------ upstream-build/configdata.pm/x86_64-macos | 15 ++++++++++-- upstream-build/configdata.pm/x86_64-win32-mingw32 | 21 ++++++++++++---- upstream-build/configdata.pm/x86_64-win32-msvc | 30 ++++++++++++++++------- 8 files changed, 132 insertions(+), 42 deletions(-) (limited to 'upstream-build/configdata.pm') diff --git a/upstream-build/configdata.pm/i686-linux b/upstream-build/configdata.pm/i686-linux index e317450..fe23bad 100644 --- a/upstream-build/configdata.pm/i686-linux +++ b/upstream-build/configdata.pm/i686-linux @@ -64,7 +64,7 @@ our %config = ( perl_archname => "i386-linux-thread-multi", perl_cmd => "/usr/bin/perl", perl_version => "5.24.3", - perlargv => [ "linux-x86", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm" ], + perlargv => [ "linux-x86", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -324,7 +324,7 @@ our %disabled = ( "buildtest-c++" => "default", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", - "devcryptoeng" => "default", + "devcryptoeng" => "option", "ec_nistp_64_gcc_128" => "default", "egd" => "default", "external-tests" => "default", @@ -3293,6 +3293,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -12487,6 +12488,11 @@ our %unified_info = ( "include", "../include", ], + "test/testutil/random.o" => + [ + "include", + "../include", + ], "test/testutil/stanza.o" => [ "include", @@ -17798,6 +17804,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -18151,6 +18158,10 @@ our %unified_info = ( [ "../test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "../test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "../test/testutil/stanza.c", diff --git a/upstream-build/configdata.pm/i686-win32-mingw32 b/upstream-build/configdata.pm/i686-win32-mingw32 index e432861..0258c2a 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.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -135,7 +135,7 @@ our %target = ( bn_obj => "bn_asm.o", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", build_file => "Makefile", - build_scheme => [ "unified", "unix" ], + build_scheme => [ "unified", "unix", "WOW" ], cast_asm_src => "c_enc.c", cast_obj => "c_enc.o", cflags => "-m32", @@ -3312,6 +3312,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -11285,12 +11286,12 @@ our %unified_info = ( ], "ms/applink.o" => [ + "apps", ".", "include", - "apps", + "../apps", "..", "../include", - "../apps", ], "ms/uplink.o" => [ @@ -12558,6 +12559,11 @@ our %unified_info = ( "include", "../include", ], + "test/testutil/random.o" => + [ + "include", + "../include", + ], "test/testutil/stanza.o" => [ "include", @@ -17900,6 +17906,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -18253,6 +18260,10 @@ our %unified_info = ( [ "../test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "../test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "../test/testutil/stanza.c", diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc index ca9726d..1ab45d9 100644 --- a/upstream-build/configdata.pm/i686-win32-msvc +++ b/upstream-build/configdata.pm/i686-win32-msvc @@ -29,6 +29,7 @@ our %config = ( MT => "mt", MTFLAGS => [ "-nologo" ], PERL => "C:\\Perl64\\bin\\perl.exe", + RANLIB => "ranlib", RC => "rc", RCFLAGS => [ ], afalgeng => "", @@ -67,7 +68,7 @@ our %config = ( perl_archname => "MSWin32-x64-multi-thread", perl_cmd => "C:\\Perl64\\bin\\perl.exe", perl_version => "5.26.3", - perlargv => [ "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "VC-WIN32" ], + perlargv => [ "VC-WIN32", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -115,8 +116,8 @@ our %config = ( sourcedir => "..", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -132,7 +133,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x259cf38)", + RANLIB => "CODE(0x258db88)", 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", @@ -3328,6 +3329,7 @@ our %unified_info = ( "test\\testutil\\init.o", "test\\testutil\\main.o", "test\\testutil\\output_helpers.o", + "test\\testutil\\random.o", "test\\testutil\\stanza.o", "test\\testutil\\tap_bio.o", "test\\testutil\\test_cleanup.o", @@ -11292,12 +11294,12 @@ our %unified_info = ( ], "ms\\applink.o" => [ + "apps", ".", "include", - "apps", + "..\\apps", "..", "..\\include", - "..\\apps", ], "ms\\uplink.o" => [ @@ -12565,6 +12567,11 @@ our %unified_info = ( "include", "..\\include", ], + "test\\testutil\\random.o" => + [ + "include", + "..\\include", + ], "test\\testutil\\stanza.o" => [ "include", @@ -17870,6 +17877,7 @@ our %unified_info = ( "test\\testutil\\init.o", "test\\testutil\\main.o", "test\\testutil\\output_helpers.o", + "test\\testutil\\random.o", "test\\testutil\\stanza.o", "test\\testutil\\tap_bio.o", "test\\testutil\\test_cleanup.o", @@ -18223,6 +18231,10 @@ our %unified_info = ( [ "..\\test\\testutil\\output_helpers.c", ], + "test\\testutil\\random.o" => + [ + "..\\test\\testutil\\random.c", + ], "test\\testutil\\stanza.o" => [ "..\\test\\testutil\\stanza.c", diff --git a/upstream-build/configdata.pm/x86_64-freebsd b/upstream-build/configdata.pm/x86_64-freebsd index 01da014..8f5694c 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.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -3189,6 +3189,8 @@ our %unified_info = ( { "deps" => [ + "ssl/packet.o", + "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3218,8 +3220,6 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", - "ssl/packet.o", - "ssl/tls13_enc.o", ], "products" => { @@ -3285,6 +3285,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -12473,6 +12474,11 @@ our %unified_info = ( "include", "../include", ], + "test/testutil/random.o" => + [ + "include", + "../include", + ], "test/testutil/stanza.o" => [ "include", @@ -17775,6 +17781,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -18128,6 +18135,10 @@ our %unified_info = ( [ "../test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "../test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "../test/testutil/stanza.c", diff --git a/upstream-build/configdata.pm/x86_64-linux b/upstream-build/configdata.pm/x86_64-linux index 7eb3ac4..4301f68 100644 --- a/upstream-build/configdata.pm/x86_64-linux +++ b/upstream-build/configdata.pm/x86_64-linux @@ -63,8 +63,8 @@ our %config = ( options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers 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 no-zlib-dynamic", perl_archname => "x86_64-linux-thread-multi", perl_cmd => "/usr/bin/perl", - perl_version => "5.26.3", - perlargv => [ "linux-x86_64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm" ], + perl_version => "5.28.2", + perlargv => [ "linux-x86_64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -325,7 +325,7 @@ our %disabled = ( "buildtest-c++" => "default", "crypto-mdebug" => "default", "crypto-mdebug-backtrace" => "default", - "devcryptoeng" => "default", + "devcryptoeng" => "option", "ec_nistp_64_gcc_128" => "default", "egd" => "default", "external-tests" => "default", @@ -3198,8 +3198,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3229,6 +3227,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { @@ -3294,6 +3294,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -12488,6 +12489,11 @@ our %unified_info = ( "include", "../include", ], + "test/testutil/random.o" => + [ + "include", + "../include", + ], "test/testutil/stanza.o" => [ "include", @@ -17799,6 +17805,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -18152,6 +18159,10 @@ our %unified_info = ( [ "../test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "../test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "../test/testutil/stanza.c", diff --git a/upstream-build/configdata.pm/x86_64-macos b/upstream-build/configdata.pm/x86_64-macos index 7abebc8..cf5ec29 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.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -3276,6 +3276,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -12452,6 +12453,11 @@ our %unified_info = ( "include", "../include", ], + "test/testutil/random.o" => + [ + "include", + "../include", + ], "test/testutil/stanza.o" => [ "include", @@ -17746,6 +17752,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -18099,6 +18106,10 @@ our %unified_info = ( [ "../test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "../test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "../test/testutil/stanza.c", diff --git a/upstream-build/configdata.pm/x86_64-win32-mingw32 b/upstream-build/configdata.pm/x86_64-win32-mingw32 index e6dd175..5417e42 100644 --- a/upstream-build/configdata.pm/x86_64-win32-mingw32 +++ b/upstream-build/configdata.pm/x86_64-win32-mingw32 @@ -62,7 +62,7 @@ our %config = ( options => "enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers 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 no-zlib-dynamic", perl_archname => "x86_64-msys-thread-multi", perl_cmd => "/usr/bin/perl", - perl_version => "5.28.2", + perl_version => "5.30.1", perlargv => [ "mingw64", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ], perlenv => { "AR" => undef, @@ -111,8 +111,8 @@ our %config = ( sourcedir => "..", target => "mingw64", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -3194,8 +3194,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3225,6 +3223,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { @@ -3290,6 +3290,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -12509,6 +12510,11 @@ our %unified_info = ( "include", "../include", ], + "test/testutil/random.o" => + [ + "include", + "../include", + ], "test/testutil/stanza.o" => [ "include", @@ -17836,6 +17842,7 @@ our %unified_info = ( "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", + "test/testutil/random.o", "test/testutil/stanza.o", "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", @@ -18189,6 +18196,10 @@ our %unified_info = ( [ "../test/testutil/output_helpers.c", ], + "test/testutil/random.o" => + [ + "../test/testutil/random.c", + ], "test/testutil/stanza.o" => [ "../test/testutil/stanza.c", diff --git a/upstream-build/configdata.pm/x86_64-win32-msvc b/upstream-build/configdata.pm/x86_64-win32-msvc index 607bee7..1eacfb7 100644 --- a/upstream-build/configdata.pm/x86_64-win32-msvc +++ b/upstream-build/configdata.pm/x86_64-win32-msvc @@ -29,6 +29,7 @@ our %config = ( MT => "mt", MTFLAGS => [ "-nologo" ], PERL => "C:\\Perl64\\bin\\perl.exe", + RANLIB => "ranlib", RC => "rc", RCFLAGS => [ ], afalgeng => "", @@ -67,7 +68,7 @@ our %config = ( perl_archname => "MSWin32-x64-multi-thread", perl_cmd => "C:\\Perl64\\bin\\perl.exe", perl_version => "5.26.3", - perlargv => [ "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng", "VC-WIN64A" ], + perlargv => [ "VC-WIN64A", "enable-md2", "enable-rc5", "enable-ssl3", "enable-ssl3-method", "enable-weak-ssl-ciphers", "no-mdc2", "no-asm", "no-devcryptoeng" ], perlenv => { "AR" => undef, "ARFLAGS" => undef, @@ -115,8 +116,8 @@ our %config = ( sourcedir => "..", target => "VC-WIN64A", tdirs => [ "ossl_shim" ], - version => "1.1.1c", - version_num => "0x1010103fL", + version => "1.1.1d", + version_num => "0x1010104fL", ); our %target = ( @@ -132,7 +133,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x65d528)", + RANLIB => "CODE(0x653500)", 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", @@ -3213,9 +3214,9 @@ our %unified_info = ( { "deps" => [ + "ms\\uplink.o", "ms\\applink.o", "ms\\applink.o", - "ms\\uplink.o", ], "products" => { @@ -3234,8 +3235,6 @@ our %unified_info = ( { "deps" => [ - "ssl\\packet.o", - "ssl\\tls13_enc.o", "ssl\\bio_ssl.o", "ssl\\d1_lib.o", "ssl\\d1_msg.o", @@ -3265,6 +3264,8 @@ our %unified_info = ( "ssl\\t1_trce.o", "ssl\\tls13_enc.o", "ssl\\tls_srp.o", + "ssl\\packet.o", + "ssl\\tls13_enc.o", ], "products" => { @@ -3330,6 +3331,7 @@ our %unified_info = ( "test\\testutil\\init.o", "test\\testutil\\main.o", "test\\testutil\\output_helpers.o", + "test\\testutil\\random.o", "test\\testutil\\stanza.o", "test\\testutil\\tap_bio.o", "test\\testutil\\test_cleanup.o", @@ -11303,12 +11305,12 @@ our %unified_info = ( ], "ms\\applink.o" => [ - "apps", ".", "include", - "..\\apps", + "apps", "..", "..\\include", + "..\\apps", ], "ms\\uplink.o" => [ @@ -12576,6 +12578,11 @@ our %unified_info = ( "include", "..\\include", ], + "test\\testutil\\random.o" => + [ + "include", + "..\\include", + ], "test\\testutil\\stanza.o" => [ "include", @@ -17886,6 +17893,7 @@ our %unified_info = ( "test\\testutil\\init.o", "test\\testutil\\main.o", "test\\testutil\\output_helpers.o", + "test\\testutil\\random.o", "test\\testutil\\stanza.o", "test\\testutil\\tap_bio.o", "test\\testutil\\test_cleanup.o", @@ -18239,6 +18247,10 @@ our %unified_info = ( [ "..\\test\\testutil\\output_helpers.c", ], + "test\\testutil\\random.o" => + [ + "..\\test\\testutil\\random.c", + ], "test\\testutil\\stanza.o" => [ "..\\test\\testutil\\stanza.c", -- cgit v1.1