commit: 2da095fbd2e42aab959832bb9634e2dfe591ee69 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Oct 25 17:15:05 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Oct 25 17:15:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da095fb
net-misc/freerdp: restore patches Closes: https://bugs.gentoo.org/820239 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 61 ++++++++++++++++++++++ ...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 ++++++++++ 2 files changed, 89 insertions(+) diff --git a/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch new file mode 100644 index 00000000000..e4662751e5c --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch @@ -0,0 +1,61 @@ +From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <[email protected]> +Date: Wed, 12 May 2021 12:48:15 +0200 +Subject: [PATCH] Fix FIPS mode support and build with OpenSSL 3.0 + +FreeRDP fails to build with OpenSSL 3.0 because of usage of the `FIPS_mode` +and `FIPS_mode_set` functions, which were removed there. Just a note that +the FIPS mode is not supported by OpenSSL 1.1.* although the mentioned +functions are still there (see https://wiki.openssl.org/index.php/FIPS_modules). +Let's make FreeRDP build with OpenSSL 3.0 and fix the FIPS mode support. + +See: https://bugzilla.redhat.com/show_bug.cgi?id=1952937 +--- + winpr/libwinpr/utils/ssl.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index 3a859039034..03b23af43ac 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -244,9 +244,17 @@ static BOOL winpr_enable_fips(DWORD flags) + #else + WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); + ++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ if (!EVP_default_properties_is_fips_enabled(NULL)) ++#else + if (FIPS_mode() != 1) ++#endif + { ++#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ if (EVP_set_default_properties(NULL, "fips=yes")) ++#else + if (FIPS_mode_set(1)) ++#endif + WLog_INFO(TAG, "Openssl fips mode ENabled!"); + else + { +From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Sun, 1 Aug 2021 12:14:43 -0400 +Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 + +Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad +--- + winpr/libwinpr/utils/ssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index 03b23af43ac..74ef156e7b0 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void) + { + #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) + return FALSE; ++#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) ++ return (EVP_default_properties_is_fips_enabled(NULL) == 1); + #else + return (FIPS_mode() == 1); + #endif diff --git a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch new file mode 100644 index 00000000000..b8977aecd56 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch @@ -0,0 +1,28 @@ +From 7f53e1c6c8503e9d3966c96bd403573f44879b0c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Sat, 7 Aug 2021 21:49:12 -0400 +Subject: [PATCH] Fix TestUnicodeConversion on big endian machines + +Wide character literals are stored in native byte order. +Use an array of bytes as a reference instead. + +Fixes: https://github.com/FreeRDP/FreeRDP/issues/6968 +--- + winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +index 3bc9c245181..cc2a2597dd8 100644 +--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c ++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +@@ -403,8 +403,8 @@ static BOOL test_ConvertToUnicode_wrapper(void) + /* Test static string buffers of differing sizes */ + { + char name[] = "someteststring"; +- const WCHAR cmp[] = { L's', L'o', L'm', L'e', L't', L'e', L's', L't', +- L's', L't', L'r', L'i', L'n', L'g', 0 }; ++ const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 'e', 0, 's', 0, 't', 0, ++ 's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 }; + WCHAR xname[128] = { 0 }; + LPWSTR aname = NULL; + LPWSTR wname = &xname[0];
