commit: 9ef604de7f80a1db7a66d4574623bc3127862125 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jul 31 19:55:43 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jul 31 19:55:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef604de
net-misc/freerdp: fix build with openssl-3.0 Closes: https://bugs.gentoo.org/805548 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/freerdp/files/freerdp-2-openssl-3.0.patch | 38 ++++++++++++++++++++++ net-misc/freerdp/freerdp-2.3.2.ebuild | 4 +++ net-misc/freerdp/freerdp-2.9999.ebuild | 4 +++ 3 files changed, 46 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..74b9d406130 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2-openssl-3.0.patch @@ -0,0 +1,38 @@ +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 + { diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild index 50350a7d1f9..c08a85f6d05 100644 --- a/net-misc/freerdp/freerdp-2.3.2.ebuild +++ b/net-misc/freerdp/freerdp-2.3.2.ebuild @@ -88,6 +88,10 @@ BDEPEND=" ) ) " +PATCHES=( + "${FILESDIR}/freerdp-2-openssl-3.0.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 50350a7d1f9..c08a85f6d05 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -88,6 +88,10 @@ BDEPEND=" ) ) " +PATCHES=( + "${FILESDIR}/freerdp-2-openssl-3.0.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF)
