From 1e2e80be2fd2ad4123ee6df584ff52c903a81676 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 16 Mar 2022 21:29:08 +0300 Subject: Release version 1.1.1+16 Upgrade to 1.1.1n --- upstream-build/configdata.pm/arm64-macos | 8 ++++---- upstream-build/configdata.pm/i686-linux | 8 ++++---- upstream-build/configdata.pm/i686-win32-mingw32 | 15 ++++++++++----- upstream-build/configdata.pm/i686-win32-msvc | 15 ++++++++++----- upstream-build/configdata.pm/x86_64-freebsd | 4 ++-- upstream-build/configdata.pm/x86_64-linux | 8 ++++---- upstream-build/configdata.pm/x86_64-macos | 4 ++-- upstream-build/configdata.pm/x86_64-win32-mingw32 | 4 ++-- upstream-build/configdata.pm/x86_64-win32-msvc | 17 +++++++++++------ 9 files changed, 49 insertions(+), 34 deletions(-) (limited to 'upstream-build/configdata.pm') diff --git a/upstream-build/configdata.pm/arm64-macos b/upstream-build/configdata.pm/arm64-macos index 5461972..e09de12 100644 --- a/upstream-build/configdata.pm/arm64-macos +++ b/upstream-build/configdata.pm/arm64-macos @@ -111,8 +111,8 @@ our %config = ( sourcedir => "..", target => "darwin64-arm64-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( @@ -3192,8 +3192,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3223,6 +3221,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { diff --git a/upstream-build/configdata.pm/i686-linux b/upstream-build/configdata.pm/i686-linux index 36dbfec..0607505 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( @@ -3208,6 +3208,8 @@ our %unified_info = ( { "deps" => [ + "ssl/packet.o", + "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3237,8 +3239,6 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", - "ssl/packet.o", - "ssl/tls13_enc.o", ], "products" => { diff --git a/upstream-build/configdata.pm/i686-win32-mingw32 b/upstream-build/configdata.pm/i686-win32-mingw32 index 145f05f..2d067f9 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( @@ -3206,15 +3206,17 @@ our %unified_info = ( { "deps" => [ + "ms/uplink.o", + "ms/applink.o", "ms/applink.o", "ms/applink.o", - "ms/uplink.o", ], "products" => { "bin" => [ "apps/openssl", + "test/ec_internal_test", "test/uitest", ], "lib" => @@ -3227,8 +3229,6 @@ our %unified_info = ( { "deps" => [ - "ssl/packet.o", - "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3258,6 +3258,8 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", + "ssl/packet.o", + "ssl/tls13_enc.o", ], "products" => { @@ -10011,9 +10013,11 @@ our %unified_info = ( ], "ms/applink.o" => [ + "crypto/ec", ".", "include", "apps", + "../crypto/ec", "..", "../include", "../apps", @@ -16480,6 +16484,7 @@ our %unified_info = ( ], "test/ec_internal_test" => [ + "ms/applink.o", "test/ec_internal_test.o", ], "test/ec_internal_test.o" => diff --git a/upstream-build/configdata.pm/i686-win32-msvc b/upstream-build/configdata.pm/i686-win32-msvc index 378d817..00ac7c1 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( @@ -132,7 +132,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x2534430)", + RANLIB => "CODE(0x24f43e0)", 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", @@ -3226,6 +3226,7 @@ our %unified_info = ( [ "ms\\applink.o", "ms\\applink.o", + "ms\\applink.o", "ms\\uplink.o", ], "products" => @@ -3233,6 +3234,7 @@ our %unified_info = ( "bin" => [ "apps\\openssl", + "test\\ec_internal_test", "test\\uitest", ], "lib" => @@ -10023,11 +10025,13 @@ our %unified_info = ( "ms\\applink.o" => [ ".", - "include", "apps", + "include", + "crypto\\ec", "..", - "..\\include", "..\\apps", + "..\\include", + "..\\crypto\\ec", ], "ms\\uplink.o" => [ @@ -16454,6 +16458,7 @@ our %unified_info = ( ], "test\\ec_internal_test" => [ + "ms\\applink.o", "test\\ec_internal_test.o", ], "test\\ec_internal_test.o" => diff --git a/upstream-build/configdata.pm/x86_64-freebsd b/upstream-build/configdata.pm/x86_64-freebsd index 13c3a3f..f66f1b1 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( diff --git a/upstream-build/configdata.pm/x86_64-linux b/upstream-build/configdata.pm/x86_64-linux index fbf30ba..a9e27a5 100644 --- a/upstream-build/configdata.pm/x86_64-linux +++ b/upstream-build/configdata.pm/x86_64-linux @@ -112,8 +112,8 @@ our %config = ( sourcedir => "..", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( @@ -3209,6 +3209,8 @@ our %unified_info = ( { "deps" => [ + "ssl/packet.o", + "ssl/tls13_enc.o", "ssl/bio_ssl.o", "ssl/d1_lib.o", "ssl/d1_msg.o", @@ -3238,8 +3240,6 @@ our %unified_info = ( "ssl/t1_trce.o", "ssl/tls13_enc.o", "ssl/tls_srp.o", - "ssl/packet.o", - "ssl/tls13_enc.o", ], "products" => { diff --git a/upstream-build/configdata.pm/x86_64-macos b/upstream-build/configdata.pm/x86_64-macos index 1ee5d3b..6f40342 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( diff --git a/upstream-build/configdata.pm/x86_64-win32-mingw32 b/upstream-build/configdata.pm/x86_64-win32-mingw32 index a8945a1..cc044fa 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( diff --git a/upstream-build/configdata.pm/x86_64-win32-msvc b/upstream-build/configdata.pm/x86_64-win32-msvc index 19b9a4a..3894267 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.1l", - version_num => "0x101010cfL", + version => "1.1.1n", + version_num => "0x101010efL", ); our %target = ( @@ -132,7 +132,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0xe34208)", + RANLIB => "CODE(0x2564160)", 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", @@ -3226,15 +3226,17 @@ our %unified_info = ( { "deps" => [ + "ms\\uplink.o", + "ms\\applink.o", "ms\\applink.o", "ms\\applink.o", - "ms\\uplink.o", ], "products" => { "bin" => [ "apps\\openssl", + "test\\ec_internal_test", "test\\uitest", ], "lib" => @@ -3247,8 +3249,6 @@ our %unified_info = ( { "deps" => [ - "ssl\\packet.o", - "ssl\\tls13_enc.o", "ssl\\bio_ssl.o", "ssl\\d1_lib.o", "ssl\\d1_msg.o", @@ -3278,6 +3278,8 @@ our %unified_info = ( "ssl\\t1_trce.o", "ssl\\tls13_enc.o", "ssl\\tls_srp.o", + "ssl\\packet.o", + "ssl\\tls13_enc.o", ], "products" => { @@ -10031,9 +10033,11 @@ our %unified_info = ( ], "ms\\applink.o" => [ + "crypto\\ec", ".", "include", "apps", + "..\\crypto\\ec", "..", "..\\include", "..\\apps", @@ -16468,6 +16472,7 @@ our %unified_info = ( ], "test\\ec_internal_test" => [ + "ms\\applink.o", "test\\ec_internal_test.o", ], "test\\ec_internal_test.o" => -- cgit v1.1