Use header presence status to avoid openssl engine

Include presence of openssl/engine.h as indication engines should not be used. Skip engine if header is not present.
NLnetLabs · Jul 19, 2024 · 51dedf3 · 51dedf3
1 parent 0aa0c15
commit 51dedf3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
@@ -22,8 +22,12 @@
 #include <ldns/keys.h>
 
 #include <openssl/conf.h>
-#ifndef OPENSSL_NO_ENGINE
+#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE)
 #include <openssl/engine.h>
+#else
+#  ifndef OPENSSL_NO_ENGINE
+#  define OPENSSL_NO_ENGINE
+#  endif
 #endif
 #include <openssl/err.h>
 

diff --git a/keys.c b/keys.c
@@ -23,8 +23,12 @@
 #ifdef USE_DSA
 #include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_ENGINE
+#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE)
 #include <openssl/engine.h>
+#else
+#  ifndef OPENSSL_NO_ENGINE
+#  define OPENSSL_NO_ENGINE
+#  endif
 #endif
 #endif /* HAVE_SSL */