]> granicus.if.org Git - curl/commitdiff
curl: do not set CURLOPT_SSLENGINEDEFAULT automatically
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 23 Aug 2016 10:46:23 +0000 (11:46 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Sun, 16 Oct 2016 11:18:07 +0000 (13:18 +0200)
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

src/tool_operate.c

index 97bb87b3d6c7f69ef1b052cfdb378283824d7ed4..54a57a03c337c4d027d701fe368cf53457d9412b 100644 (file)
@@ -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