From 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad Mon Sep 17 00:00:00 2001 From: Ondrej Holy 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 { From e59acc13c8f9b522a15fd586e643f04af1a79d9a Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 1 Aug 2021 12:14:43 -0400 Subject: [PATCH] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad --- 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 03b23af43ac..74ef156e7b0 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