From 9f4b8ed7c7be94564bf9c0f8805a21aee3b016cb Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sat, 22 Oct 2022 05:11:41 +0000 Subject: [PATCH] Merge r1901772 from trunk * mod_ssl: Missing bit from r1901470 to handle OpenSSL-3+ FIPS. OPENSSL_FIPS is no longer defined with openssl-3, it always HAVE_FIPS. PR: 66063 (follow-up) Submitted by: ylavic Reviewed by: rpluem, ylavic, icing Backported by: jailletc36 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1904771 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index 5d238b79644..cd8df07ca20 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -147,7 +147,7 @@ #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L) #endif -#if defined(OPENSSL_FIPS) +#if defined(OPENSSL_FIPS) || OPENSSL_VERSION_NUMBER >= 0x30000000L #define HAVE_FIPS #endif -- 2.47.3