From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 9 Jan 2019 17:42:21 +0000 (+0000)
Subject: Fix OpenSSL builds that define OPENSSL_NO_ENGINE (#349)
X-Git-Tag: M-staged-PR362~10
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=186fc1d7c3bad845882d8e3497af9c3a42d75e8f;p=thirdparty%2Fsquid.git

Fix OpenSSL builds that define OPENSSL_NO_ENGINE (#349)

Even with ENGINE support disabled, OpenSSL provides the openssl/engine.h
header. We have to use OPENSSL_NO_ENGINE to detect ENGINE support.
---

diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index f6d4ce7aaf..e350a73509 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -485,7 +485,7 @@ Ssl::Initialize(void)
 
     SQUID_OPENSSL_init_ssl();
 
-#if HAVE_OPENSSL_ENGINE_H
+#if !defined(OPENSSL_NO_ENGINE)
     if (::Config.SSL.ssl_engine) {
         ENGINE_load_builtin_engines();
         ENGINE *e;