From patchwork Tue Jan 11 22:47:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2328 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E69FC433EF for ; Tue, 11 Jan 2022 22:47:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.15469.1641941258987425941 for ; Tue, 11 Jan 2022 14:47:39 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=JNFK+xlF; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 8A02A82EBB; Tue, 11 Jan 2022 23:47:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641941255; bh=9c8dAcPhSmRbZ7wIY7SC6VrrYVThip317xiL3Sh3Ywg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JNFK+xlF+/C9TuWHXV85vWPaCNY1nJ+Ac1KZ28MA22LYe0QoGd/M/8JjSMOA7BFbw fW5JDm7W0gNi4rq5UxHfIIPTuqP52mGxjD23x6tkn66DKzrn68cwrAR9I3pVXl7+RH qRF3wS/JUhzNcKF3e6vacSwou26BqejnXAau8oIb17JmXwl4CdzSs1vcQxob6Uzvx5 wz9lxZq79mYmmtDqs7tpVh9n/yKuOq6fWN9Dvx/x1duEy/F2l47rZ0AewJDUA7waKi dtOnRYdwiNq2/L+pnP/SLsdPedSxJwj0MZ3LpC5rMJnXWSu9Xn/+D6sK70ToLAi6Bp 89vl7L5w7DfgQ== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Marek Vasut , Alexander Kanavin Subject: [meta-oe][dunfell][PATCH 4/5] freerdp: Upgrade 2.3.0 -> 2.4.1 Date: Tue, 11 Jan 2022 23:47:13 +0100 Message-Id: <20220111224714.1289840-4-marex@denx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111224714.1289840-1-marex@denx.de> References: <20220111224714.1289840-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Jan 2022 22:47:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94763 Upgrade freerdp to latest stable 2.x version and drop OpenSSL 3.x backports which are already upstream. (cherry picked from commit 2b571a394acc3e006f0207c2152f3f895816c695) Signed-off-by: Marek Vasut Cc: Alexander Kanavin Cc: Khem Raj Signed-off-by: Khem Raj CVE: CVE-2021-41159 CVE-2021-41160 --- CVEs added per https://lwn.net/Articles/876306/ --- ...e-support-and-build-with-OpenSSL-3.0.patch | 43 ------------------- ...d-calling-FIPS_mode-with-OpenSSL-3.0.patch | 28 ------------ .../{freerdp_2.3.0.bb => freerdp_2.4.1.bb} | 4 +- 3 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch delete mode 100644 meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch rename meta-oe/recipes-support/freerdp/{freerdp_2.3.0.bb => freerdp_2.4.1.bb} (94%) diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch deleted file mode 100644 index 04fe644d4..000000000 --- a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f703b1184229796d504a2e833f72ace4cc605d15 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Wed, 12 May 2021 12:48:15 +0200 -Subject: [PATCH 1/2] 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 -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - 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 3a8590390..03b23af43 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 - { --- -2.20.1 - diff --git a/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch b/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch deleted file mode 100644 index 728638e15..000000000 --- a/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4dbf108c0ae5e997d5c432f3da4b4c5fd7b35373 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 1 Aug 2021 12:14:43 -0400 -Subject: [PATCH 2/2] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 - -Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - 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 03b23af43..74ef156e7 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 --- -2.20.1 - diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb similarity index 94% rename from meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb rename to meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb index 57170f68a..7ea7b71ef 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb @@ -13,11 +13,9 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" +SRCREV = "d39a7ba5c38e3ba3b99b1558dc2ab0970cbfb0c5" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ - file://0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch \ - file://0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch \ " S = "${WORKDIR}/git"