From d0af2840b1b16dd95b9a468e46b6e275186e5447 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 12:10:59 +0100 Subject: [PATCH] package/freerdp: fix libressl build Fix the following build failure with libressl raised since bump to version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) case NID_sha3_224: ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...e-sha3-and-shake-hashes-for-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch diff --git a/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch new file mode 100644 index 0000000000..14f615e2e7 --- /dev/null +++ b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch @@ -0,0 +1,38 @@ +From bd093454fe126163634c00b7484ab7fee6ffe670 Mon Sep 17 00:00:00 2001 +From: akallabeth +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 +--- + 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;