From: Petr Menšík <pemensik@redhat.com>
Date: Fri, 19 Jul 2024 11:04:40 +0000 (+0200)
Subject: Use header presence status to avoid openssl engine
X-Git-Tag: 1.8.4~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51dedf31634981f839a391d94d57bf4e0acb7090;p=thirdparty%2Fldns.git

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.
---

diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 9425833e..509a023d 100644
--- 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
index 59de186e..b0927391 100644
--- 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 */