| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 1 | From 4dbf108c0ae5e997d5c432f3da4b4c5fd7b35373 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mike Gilbert <floppym@gentoo.org> |
| 3 | Date: Sun, 1 Aug 2021 12:14:43 -0400 |
| 4 | Subject: [PATCH 2/2] winpr: avoid calling FIPS_mode() with OpenSSL 3.0 |
| 5 | |
| 6 | Fixes: 26bf2816c3e0daeaf524c47cf0fcda8ae13b65ad |
| 7 | Upstream-Status: Backport |
| 8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 9 | --- |
| 10 | winpr/libwinpr/utils/ssl.c | 2 ++ |
| 11 | 1 file changed, 2 insertions(+) |
| 12 | |
| 13 | diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c |
| 14 | index 03b23af43..74ef156e7 100644 |
| 15 | --- a/winpr/libwinpr/utils/ssl.c |
| 16 | +++ b/winpr/libwinpr/utils/ssl.c |
| 17 | @@ -364,6 +364,8 @@ BOOL winpr_FIPSMode(void) |
| 18 | { |
| 19 | #if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) |
| 20 | return FALSE; |
| 21 | +#elif defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) |
| 22 | + return (EVP_default_properties_is_fips_enabled(NULL) == 1); |
| 23 | #else |
| 24 | return (FIPS_mode() == 1); |
| 25 | #endif |
| 26 | -- |
| 27 | 2.20.1 |
| 28 | |