Fabrice Fontaine 2023-09-16 00:16:22 +02:00 committed by Yann E. MORIN
parent c88c1d3319
commit 4ccfb2561f
4 changed files with 3 additions and 42 deletions

View File

@ -446,7 +446,6 @@ package/freeradius-client/0001-fix-for-nettle.patch Upstream
package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream
package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream
package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream
package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch Upstream
package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream
package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream
package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables

View File

@ -1,38 +0,0 @@
From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Mon, 20 Feb 2023 16:23:39 +0100
Subject: [PATCH] Fix #8702: Disable sha3 and shake hashes for libressl
[Retrieved (and backported) from:
https://github.com/FreeRDP/FreeRDP/pull/8708/commits/bd093454fe126163634c00b7484ab7fee6ffe670]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
libfreerdp/crypto/x509_utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
index 6e87a88b8d8..62cf2939be7 100644
--- a/libfreerdp/crypto/crypto.c
+++ b/libfreerdp/crypto/crypto.c
@@ -748,7 +748,7 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert)
return WINPR_MD_SHA512;
case NID_ripemd160:
return WINPR_MD_RIPEMD160;
-#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x1010101fL) && !defined(LIBRESSL_VERSION_NUMBER)
case NID_sha3_224:
return WINPR_MD_SHA3_224;
case NID_sha3_256:
@@ -757,11 +757,11 @@ WINPR_MD_TYPE x509_utils_get_signature_alg(const X509* xcert)
return WINPR_MD_SHA3_384;
case NID_sha3_512:
return WINPR_MD_SHA3_512;
-#endif
case NID_shake128:
return WINPR_MD_SHAKE128;
case NID_shake256:
return WINPR_MD_SHAKE256;
+#endif
case NID_undef:
default:
return WINPR_MD_NONE;

View File

@ -1,5 +1,5 @@
# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256
sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz
# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256
sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz
# Locally calculated
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE

View File

@ -4,7 +4,7 @@
#
################################################################################
FREERDP_VERSION = 2.10.0
FREERDP_VERSION = 2.11.0
FREERDP_SITE = https://pub.freerdp.com/releases
FREERDP_DEPENDENCIES = libglib2 openssl zlib
FREERDP_LICENSE = Apache-2.0