- Fix OpenSSL without ENGINE support compilation.

git-svn-id: file:///svn/unbound/trunk@5095 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/daemon.c b/daemon/daemon.c
index e14edb99df05ae8f73491aa19cad59956ba87974..e95c17bba28b020bd29aeb4d1c015017c3deddf3 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -770,7 +770,7 @@ daemon_delete(struct daemon* daemon)
 #  endif
 #  ifdef HAVE_OPENSSL_CONFIG
        EVP_cleanup();
-#  if OPENSSL_VERSION_NUMBER < 0x10100000
+#  if (OPENSSL_VERSION_NUMBER < 0x10100000) || !defined(OPENSSL_NO_ENGINE)
        ENGINE_cleanup();
 #  endif
        CONF_modules_free();

diff --git a/doc/Changelog b/doc/Changelog
index c28d4ee0f256d0d64e19589ab4fcb5cb42293bd1..8022f0f4fa4c3006ad890059baff2e1bbb7b07ea 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
        - For openssl 1.0.2 use the CRYPTO_THREADID locking callbacks,
          still supports the set_id_callback previous API.  And for 1.1.0
          no locking callbacks are needed.
+       - Fix OpenSSL without ENGINE support compilation.
 
 30 January 2019: Ralph
        - Fix case in which query timeout can result in marking delegation