From patchwork Tue Jan 11 22:47:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2324 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 B3166C433F5 for ; Tue, 11 Jan 2022 22:47:39 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web08.15441.1641941257728157349 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=uqEYYOS+; 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 8FC4480394; Tue, 11 Jan 2022 23:47:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641941254; bh=cBOz/Z1V9WbKQW8c/8D6HCmR5WxENzdabsezjo16YWE=; h=From:To:Cc:Subject:Date:From; b=uqEYYOS+5eDy+AMWFVGyUEg1c9kADqWQiGL2PrE+/UBiqH8YL7zE95HgWBZu/B0Wc FNvdK+t7kITDmuuLcFaIQAQgV+IUkknpYV0Mqr58316CiN2EcjGSq9FaU++rPo4K2p thy377/14Jxg9I4U84wvRwDmQNtpC5QHX1bWNYKp/bg5j2ujgYHYDlceY/V+hFRpIv VCn1U4+KIzFv+qKpt1aVwv3FGHxzUJkYQRohsGSpFRfpVSk1HEmIT0mr5CkM/j6MjL W9gVM+6PaMibRNWU4LhkGqfpQ5vMAD3fDqpfxmb03uKkpfbUnx8HEpyt+VRyxe5u4z g4nHvy6ptetdA== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Marek Vasut Subject: [meta-oe][dunfell][PATCH 1/5] freerdp: Upgrade to 2.2.0 Date: Tue, 11 Jan 2022 23:47:10 +0100 Message-Id: <20220111224714.1289840-1-marex@denx.de> X-Mailer: git-send-email 2.34.1 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:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94761 From: Khem Raj (cherry picked from commit f751dcf81a18fe817b40e755a2ba3f54a74d1e02) Signed-off-by: Khem Raj Signed-off-by: Marek Vasut --- .../freerdp/{freerdp_git.bb => freerdp_2.2.0.bb} | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) rename meta-oe/recipes-support/freerdp/{freerdp_git.bb => freerdp_2.2.0.bb} (94%) diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb similarity index 94% rename from meta-oe/recipes-support/freerdp/freerdp_git.bb rename to meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb index 309acfbff..90ede1297 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb @@ -11,12 +11,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pkgconfig cmake gitpkgv PE = "1" -PV = "2.0.0+gitr${SRCPV}" PKGV = "${GITPKGVTAG}" -# 2.0.0 release -SRCREV = "5ab2bed8749747b8e4b2ed431fd102bc726be684" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https \ +SRCREV = "d2ba84a6885f57674098fe8e76c5f99d880e580d" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ " From patchwork Tue Jan 11 22:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2326 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 A13B7C433FE 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.15470.1641941258987603422 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=oJozpvEO; 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 CF6F580882; Tue, 11 Jan 2022 23:47:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1641941255; bh=CfybnL4yGlF9g7M9lJNATbOR2OtVAUh0xs8pp4Gxz3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oJozpvEOGncXIQlNkVRIz2z/T1aqBcn4Kj+ptOTfH5rsjoLIsAjaMdze4Azc9rHvY Jg9GnZfcP7W8BCfxICkGGyalT7HiBWKYy2/ir1e8WpzhPxV4IXhIgUg3SgEw6h6VdS f4+KOyIL5kZAOnCMyxRUqp0dSVhpStRc0/diTfqlv8wEc841gmjQobHKLcIpOqo3Dv j4Q3Jpk7r5oU+jsxDL6wvLxZK8XbbqMNB75/wJcFnVqNuZnLKtrwlrfg8UnTLWlPHQ e9dKzuzcQMzjBnJeXYl6bi0uiZ1wnCi4JU/IFS54UZ7eDeFerM1DVv9gN6Z3YX72uh Pvsbbv6OkhzMg== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Alejandro Hernandez Samaniego , Marek Vasut Subject: [meta-oe][dunfell][PATCH 2/5] freerdp: Upgrade 2.2.0 -> 2.3.0 Date: Tue, 11 Jan 2022 23:47:11 +0100 Message-Id: <20220111224714.1289840-2-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/94762 From: Alejandro Hernandez Samaniego (cherry picked from commit c6a5fa624c4c196782f6a6acc1f4426df3dce781) Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Khem Raj Signed-off-by: Marek Vasut --- .../freerdp/{freerdp_2.2.0.bb => freerdp_2.3.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/freerdp/{freerdp_2.2.0.bb => freerdp_2.3.0.bb} (98%) diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb similarity index 98% rename from meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb rename to meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb index 90ede1297..e37e71b32 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb @@ -13,7 +13,7 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "d2ba84a6885f57674098fe8e76c5f99d880e580d" +SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ " From patchwork Tue Jan 11 22:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2327 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 A6EF5C43217 for ; Tue, 11 Jan 2022 22:47:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web08.15442.1641941259595656806 for ; Tue, 11 Jan 2022 14:47:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=Z0Y2OOwR; 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 2E7FB80FDA; 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=b8HfVP71LFMBQkGfOg/Ma0GcrVA1SM9wDcEFroqqs9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z0Y2OOwRw3cIzvPzu/C6y3C/9U8hc2ylpkb8sK1AgsyKrIPBFZ0xSg0I1BGyiBi6O Y8OK+wkqW7B3dE062C+Su6XWvpASHxv6ONCLgsi7Gc4O6DVRV6bj0j0H1OdW4aDg8/ CJMGwbyyXYfs76hDntOYIkU5n+efHMnZ5NNGg4tDLl7NChh9Bgxc/6b/qSacakHJBc L52eHlA9iiM9MB3xAM3w/BUYg8iWP9nKYp0H+Q958K//1kXLfHYDFV4DtL96TnVCWl WBGGShsAzDcbu49+PBN7EX+1z1zjxlwSp7wujk8M/mBxn+vEJbLyzUVY486iHTeRjt Wb2phlh2Y59EQ== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Alexander Kanavin , Alexander Kanavin , Marek Vasut Subject: [meta-oe][dunfell][PATCH 3/5] freerdp: backport openssl 3.x patches Date: Tue, 11 Jan 2022 23:47:12 +0100 Message-Id: <20220111224714.1289840-3-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:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94765 From: Alexander Kanavin (cherry picked from commit 17ad891757f0a66fabcb7f224c4d36fe6d69ba3b) Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj Signed-off-by: Marek Vasut --- ...e-support-and-build-with-OpenSSL-3.0.patch | 43 +++++++++++++++++++ ...d-calling-FIPS_mode-with-OpenSSL-3.0.patch | 28 ++++++++++++ .../recipes-support/freerdp/freerdp_2.3.0.bb | 2 + 3 files changed, 73 insertions(+) create mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch create mode 100644 meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch 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 new file mode 100644 index 000000000..04fe644d4 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-FIPS-mode-support-and-build-with-OpenSSL-3.0.patch @@ -0,0 +1,43 @@ +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 new file mode 100644 index 000000000..728638e15 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0002-winpr-avoid-calling-FIPS_mode-with-OpenSSL-3.0.patch @@ -0,0 +1,28 @@ +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.3.0.bb index e37e71b32..57170f68a 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb @@ -16,6 +16,8 @@ PKGV = "${GITPKGVTAG}" SRCREV = "14c7f7aed7dd4e2454ee0cd81028b9f790885021" 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" 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" From patchwork Tue Jan 11 22:47:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2325 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 9FB6AC4332F 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.web11.15672.1641941259593600937 for ; Tue, 11 Jan 2022 14:47:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=IQ40Xzqe; 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 D14A182F89; 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=1641941256; bh=IG7fKHneN1qf+cYuCV7kYqJn6PeyKgTMV+KJQn2cyaU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IQ40XzqetSzJTTckdYhC9Sk6SWToJ8R4GohNyrdU+eB7A6e32OjTIDJsYKQYH9dhj EjrNiBYxh+uiVq+4poSWMank3BtjyY5qt5A5WQYWp+0gqd/57dnWJ1KIKrFe7FjS7b vPekYHx6WbyEWjIN3OWLtuOZW9RFMuSYgdXHrXiImQtNCp7gbHLkK+ZJ18Kzq7sj3g 2Xp1YTmEwxBgzhaSxswP0aipiR5YpSDPGr2AgBHNZv/seCU1bjMQFLU2fkuayy5aPb lkCfKZNvvuapbRsYhw9XqZA5e/K5bFkDyU70EkQrGXISFJk9eKYMGeaamfK7thk1+n tIvTPfxEED5Uw== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Marek Vasut , Alexander Kanavin Subject: [meta-oe][dunfell][PATCH 5/5] freerdp: Add missing libusb1 dependency Date: Tue, 11 Jan 2022 23:47:14 +0100 Message-Id: <20220111224714.1289840-5-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/94764 The freerdp does depend on libusb1 for rdpdr device forwarding. This missing dependency is currently hidden, since it is pulled in by pcsc-lite, but if the later is removed from DEPENDS, the build fails. Add the missing dependency. (cherry picked from commit 26658cc249746f780f0aea72a638a664897c3c6e) Signed-off-by: Marek Vasut Cc: Alexander Kanavin Cc: Khem Raj Signed-off-by: Khem Raj --- meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb b/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb index 7ea7b71ef..055176e39 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.4.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "FreeRDP RDP client & server library" HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "openssl alsa-lib pcsc-lite" +DEPENDS = "openssl alsa-lib pcsc-lite libusb1" SECTION = "net" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"