From c9296f79a8323bce56898f3b5021543807f1168f Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 1 Oct 2019 21:23:35 +0100 Subject: Use curl API (versions after 7.56.0) to determine if openssl is in use --- content/fetchers/curl.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index 8e1ebad63..f24e3de86 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -1592,6 +1592,18 @@ nserror fetch_curl_register(void) .finalise = fetch_curl_finalise }; +#if LIBCURL_VERSION_NUM >= 0x073800 + /* version 7.56.0 can select which SSL backend to use */ + CURLsslset setres; + + setres = curl_global_sslset(CURLSSLBACKEND_OPENSSL, NULL, NULL); + if (setres == CURLSSLSET_OK) { + curl_with_openssl = true; + } else { + curl_with_openssl = false; + } +#endif + NSLOG(netsurf, INFO, "curl_version %s", curl_version()); code = curl_global_init(CURL_GLOBAL_ALL); @@ -1673,17 +1685,24 @@ nserror fetch_curl_register(void) SETOPT(CURLOPT_CAPATH, nsoption_charp(ca_path)); } - /* Detect whether the SSL CTX function API works */ - code = curl_easy_setopt(fetch_blank_curl, - CURLOPT_SSL_CTX_FUNCTION, NULL); +#if LIBCURL_VERSION_NUM < 0x073800 + /* + * before 7.56.0 Detect openssl from whether the SSL CTX + * function API works + */ + code = curl_easy_setopt(fetch_blank_curl, CURLOPT_SSL_CTX_FUNCTION, NULL); if (code != CURLE_OK) { curl_with_openssl = false; } else { + curl_with_openssl = true; + } +#endif + + if (curl_with_openssl) { /* only set the cipher list with openssl otherwise the * fetch fails with "Unknown cipher in list" */ SETOPT(CURLOPT_SSL_CIPHER_LIST, CIPHER_LIST); - curl_with_openssl = true; } NSLOG(netsurf, INFO, "cURL %slinked against openssl", -- cgit v1.2.3