From: Wouter Wijngaards Date: Thu, 31 Jan 2019 11:34:11 +0000 (+0000) Subject: - Fix OpenSSL without ENGINE support compilation. X-Git-Tag: release-1.9.1rc1~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cf5eae166aba4e93206eec102245a8e5355e048;p=thirdparty%2Funbound.git - 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 e14edb99d..e95c17bba 100644 --- 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 c28d4ee0f..8022f0f4f 100644 --- 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