You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2022/10/22 05:11:41 UTC
svn commit: r1904771 - in /httpd/httpd/branches/2.4.x: ./ modules/ssl/ssl_private.h
Author: jailletc36
Date: Sat Oct 22 05:11:41 2022
New Revision: 1904771
URL: http://svn.apache.org/viewvc?rev=1904771&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1901772
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h?rev=1904771&r1=1904770&r2=1904771&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h Sat Oct 22 05:11:41 2022
@@ -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