Don't build engine.c if we're using OpenSSL 3.0

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 6b3f1a869d5bc06e32734b137086bcf34f16e6d3..e6917da14b25b91c01d0b7cf19d3e28872abd50b 100644 (file)
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -70,6 +70,10 @@ RCSID("$Id$")
 #  include <systemd/sd-daemon.h>
 #endif
 
+#if defined(HAVE_OPENSSL_CRYPTO_H) && OPENSSL_VERSION_NUMBER >= 0x30000000L
+#  include <openssl/provider.h>
+#endif
+
 char const *radiusd_version = RADIUSD_VERSION_STRING_BUILD("FreeRADIUS");
 static pid_t radius_pid;
 

diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
index 0d8d7b1ec78c18f7691c213c32cbb60a741a23bb..0ff2963b35b777fd2b1eda9a6e37df41e14fee9b 100644 (file)
--- a/src/lib/tls/base.c
+++ b/src/lib/tls/base.c
@@ -393,7 +393,9 @@ void fr_openssl_free(void)
 {
        if (--instance_count > 0) return;
 
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
        fr_tls_engine_free_all();
+#endif
 
        OPENSSL_cleanup();
 
@@ -458,7 +460,9 @@ int fr_openssl_init(void)
         *      FIXME - This should be done _after_
         *      running any engine controls.
         */
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
        fr_tls_engine_load_builtin();
+#endif
 
        fr_tls_log_init();
 

diff --git a/src/lib/tls/engine.c b/src/lib/tls/engine.c
index 709890d3edca1dd5520d4a75f61a05814b6ac370..a87991e4b968e1fea479bb93365f0136f6a4114e 100644 (file)
--- a/src/lib/tls/engine.c
+++ b/src/lib/tls/engine.c
@@ -37,6 +37,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/value.h>
 
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
 #include <openssl/engine.h>
 
 /** Our wrapper around an OpenSSL engine
@@ -491,3 +492,4 @@ void fr_tls_engine_free_all(void)
 }
 
 #endif
+#endif