[Fix] Remove deprecated OpenSSL engine.h include

OpenSSL ENGINE API was deprecated in 3.0 and the header is removed
in newer versions. In dkim.c it was unused; in ssl_util.c we now
conditionally include it only for OpenSSL versions that need it.

diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index 67a6edf4f736d69dd81650d958cc44976e49b779..18168045935e67f64ff30129ba5174eca54cbb02 100644 (file)
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -28,7 +28,6 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
-#include <openssl/engine.h>
 
 /* special DNS tokens */
 #define DKIM_DNSKEYNAME "_domainkey"

diff --git a/src/libserver/ssl_util.c b/src/libserver/ssl_util.c
index 78d1c02a76f2c3b563c75b1972a9e90ba3ba9ee1..c10a869dd8674b354995e9d4dce22152cfff5773 100644 (file)
--- a/src/libserver/ssl_util.c
+++ b/src/libserver/ssl_util.c
@@ -30,8 +30,11 @@
 #include <openssl/rand.h>
 #include <openssl/conf.h>
 #include <openssl/evp.h>
-#include <openssl/engine.h>
 #include <openssl/x509v3.h>
+/* ENGINE API is deprecated in OpenSSL 3.0 and removed in later versions */
+#if OPENSSL_VERSION_NUMBER >= 0x1000104fL && OPENSSL_VERSION_NUMBER < 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
+#include <openssl/engine.h>
+#endif
 
 enum rspamd_ssl_state {
        ssl_conn_reset = 0,