From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 25 Jun 2019 18:35:22 +0000 (+0200)
Subject: openssl: disable engine if OPENSSL_NO_UI_CONSOLE is defined
X-Git-Tag: curl-7_65_2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c40eb3220cf73323aef6e49f8ab75b79cc435008;p=curl

openssl: disable engine if OPENSSL_NO_UI_CONSOLE is defined

... since that needs UI_OpenSSL() which isn't provided when OpenSSL is
built with OPENSSL_NO_UI_CONSOLE which happens when OpenSSL is built for
UWP (with "VC-WIN32-UWP").

Reported-by: Vasily Lobaskin
Fixes #4073
Closes #4077
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index fa6d0201a..3cdcbfeb9 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -75,7 +75,7 @@
 #endif
 
 #if (OPENSSL_VERSION_NUMBER >= 0x0090700fL) && /* 0.9.7 or later */     \
-  !defined(OPENSSL_NO_ENGINE)
+  !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_UI_CONSOLE)
 #define USE_OPENSSL_ENGINE
 #include <openssl/engine.h>
 #endif