Merge pull request BOINC#4545 from AenBleidd/vko_4542_build_curl_for_windows_without_openssl

[Windows] Build curl for Windows without openssl.

Author: RichardHaselgrove

client/http_curl.cpp

@@ -252,7 +252,6 @@ void HTTP_OP::reset() {
 
 HTTP_OP::HTTP_OP() {
     safe_strcpy(m_url, "");
-    safe_strcpy(m_curl_ca_bundle_location, "");
     safe_strcpy(m_curl_user_credentials, "");
     content_length = 0;
     file_offset = 0;
@@ -486,50 +485,7 @@ int HTTP_OP::libcurl_exec(
 
     // if the above is nonzero, you need the following:
     //
-#ifdef _WIN32
-    if (strlen(m_curl_ca_bundle_location) == 0) {
-        TCHAR szPath[MAX_PATH-1];
-        GetModuleFileName(NULL, szPath, (sizeof(szPath)/sizeof(TCHAR)));
-
-        TCHAR *pszProg = strrchr(szPath, '\\');
-        if (pszProg) {
-            szPath[pszProg - szPath + 1] = 0;
-
-            strlcat(
-                m_curl_ca_bundle_location,
-                szPath,
-                sizeof(m_curl_ca_bundle_location)
-            );
-            strlcat(
-                m_curl_ca_bundle_location,
-                CA_BUNDLE_FILENAME,
-                sizeof(m_curl_ca_bundle_location)
-            );
-
-            if (log_flags.http_debug) {
-                msg_printf(
-                    project,
-                    MSG_INFO,
-                    "[http] HTTP_OP::libcurl_exec(): ca-bundle '%s'",
-                    m_curl_ca_bundle_location
-                );
-            }
-        }
-    }
-    if (boinc_file_exists(m_curl_ca_bundle_location)) {
-        // call this only if a local copy of ca-bundle.crt exists;
-        // otherwise, let's hope that it exists in the default place
-        //
-        curl_easy_setopt(curlEasy, CURLOPT_CAINFO, m_curl_ca_bundle_location);
-        if (log_flags.http_debug) {
-            msg_printf(
-                project,
-                MSG_INFO,
-                "[http] HTTP_OP::libcurl_exec(): ca-bundle set"
-            );
-        }
-    }
-#else
+#ifndef _WIN32
     if (boinc_file_exists(CA_BUNDLE_FILENAME)) {
         // call this only if a local copy of ca-bundle.crt exists;
         // otherwise, let's hope that it exists in the default place

client/http_curl.h

@@ -58,8 +58,6 @@ class HTTP_OP {
     PROJECT* project;   // associated project, if any
 
     char m_url[1024];  
-    char m_curl_ca_bundle_location[256];
-        // string needed for ssl support
     char m_curl_user_credentials[1024];
         // string needed for proxy username/password
 

win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj

@@ -166,13 +166,19 @@
     <Exec Command="$(TMP)\7z\7za x $(TMP)\cublas_dev.exe -onvcc -aoa" WorkingDirectory="$(CudaRootDir)" ConsoleToMSBuild="true" />
     <Touch Files="$(CudaGuardFile)" AlwaysCreate="true" />
   </Target>
-  <Target Name="InstallVcpkg" BeforeTargets="Build3rdPartyLibraries" DependsOnTargets="CreateFolders" AfterTargets="DownloadCUDA">
+  <Target Name="InstallVcpkg" BeforeTargets="RemoveOutdated3rdPartyLibraries" DependsOnTargets="CreateFolders" AfterTargets="DownloadCUDA">
     <Exec Command="git clone https://github.com/microsoft/vcpkg" WorkingDirectory="$(Windows3rdPartyBuildDir)" ConsoleToMSBuild="true" Condition="!Exists($(VcpkgRootDir))" />
     <Exec Command="git pull" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
     <Exec Command="bootstrap-vcpkg.bat" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
   </Target>
-  <Target Name="Build3rdPartyLibraries" BeforeTargets="ClCompile" DependsOnTargets="InstallVcpkg" AfterTargets="InstallVcpkg">
-    <Exec Command="vcpkg.exe install curl[core,openssl] wxwidgets opencl rappture gtest --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
+  <Target Name="RemoveOutdated3rdPartyLibraries" BeforeTargets="Build3rdPartyLibraries" DependsOnTargets="InstallVcpkg" AfterTargets="InstallVcpkg">
+    <Exec Command="vcpkg.exe list | findstr curl\[openssl\]:$(VcpkgTripletName)" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" ContinueOnError="WarnAndContinue">
+      <Output TaskParameter="ConsoleOutput" PropertyName="OutdatedCurl" />
+    </Exec>
+    <Exec Command="vcpkg.exe remove curl --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName)" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" Condition="$(OutdatedCurl) != ''" />
+  </Target>
+  <Target Name="Build3rdPartyLibraries" BeforeTargets="ClCompile" DependsOnTargets="RemoveOutdated3rdPartyLibraries" AfterTargets="RemoveOutdated3rdPartyLibraries">
+    <Exec Command="vcpkg.exe install openssl curl[core,schannel] wxwidgets opencl rappture gtest --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --recurse --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
     <Exec Command="vcpkg.exe install ftgl --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" Condition="'$(Platform)' == 'x64'" />
     <Exec Command="vcpkg.exe upgrade --no-dry-run --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName)" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
   </Target>