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

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 5d238b79644060b76e3e26d6a8a1691c11940fa4..cd8df07ca2056b8d100831f8a0ca4e644db14539 100644 (file)
--- 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