From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 23 Aug 2016 10:46:23 +0000 (+0100)
Subject: curl: do not set CURLOPT_SSLENGINEDEFAULT automatically
X-Git-Tag: curl-7_51_0~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1a5cd04877fd6fd;p=curl

curl: do not set CURLOPT_SSLENGINEDEFAULT automatically

There were bugs in the PKCS#11 engine, and fixing them triggers bugs in
OpenSSL. Just don't get involved; there's no need to be making the
engine methods the default anyway.

https://github.com/OpenSC/libp11/pull/108
https://github.com/openssl/openssl/pull/1639

Merges #1042
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 97bb87b3d..54a57a03c 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1177,7 +1177,6 @@ static CURLcode operate_do(struct GlobalConfig *global,
           result = res_setopt_str(curl, CURLOPT_SSLENGINE, config->engine);
           if(result)
             goto show_error;
-          my_setopt(curl, CURLOPT_SSLENGINE_DEFAULT, 1L);
         }
 
         /* new in curl 7.10.7, extended in 7.19.4. Modified to use