build curl with schannel on windows

Author: p2r3

CMakeLists.txt

@@ -85,7 +85,7 @@ if (SPPLICE_TARGET_WINDOWS) # If building for Windows:
   target_link_libraries(SppliceCPP
     "archive.dll"
     "liblzma.dll"
-    "libcurl-x64.dll"
+    "libcurl-4.dll"
     "libwininet.a"
     "libws2_32.a"
   )

autobuild.sh

@@ -89,7 +89,7 @@ cd dist
 # Prepare the Windows binary for distribution.
 if [ "$target_windows" == true ] || [ "$target_both" == true ]; then
   # Copy project dependencies
-  cp ../deps/win32/lib/libcurl-x64.dll                             ./win32
+  cp ../deps/win32/lib/libcurl-4.dll                             ./win32
   cp ../deps/win32/lib/archive.dll                                 ./win32
   cp ../deps/win32/lib/liblzma.dll                                 ./win32
   cp ../deps/win32/lib/libcrypto-1_1-x64.dll                       ./win32

deps.sh

@@ -2,6 +2,34 @@
 # On the Windows side, most of this is just unzipping and sorting pre-built binaries
 # On the Linux side, we're only compiling CURL and installing Debian packages
 
+if command -v apt > /dev/null; then
+
+  echo "Checking for necessary -dev packages..."
+  sudo apt install \
+    libarchive-dev \
+    libxml2-dev \
+    liblzma-dev \
+    libacl1-dev \
+    libgl1-mesa-dev \
+    libxcb*-dev \
+    libfontconfig1-dev \
+    libxkbcommon-x11-dev \
+    libnghttp2-dev \
+    libidn2-dev
+
+  echo "Checking for MinGW for cross-compilation..."
+  sudo apt install \
+    mingw-w64 \
+    mingw-w64-tools \
+    gcc-mingw-w64-x86-64 \
+    g++-mingw-w64-x86-64
+
+  echo "Switching to POSIX threads..."
+  sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
+  sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+
+fi
+
 rm -rf ./deps
 mkdir deps
 cd deps
@@ -57,12 +85,14 @@ mkdir shared
     cd ..; rm -rf openssl
 
     mkdir curl; cd curl
-      wget https://curl.se/windows/dl-8.10.1_2/curl-8.10.1_2-win64-mingw.zip
-      unzip curl-8.10.1_2-win64-mingw.zip
-      mv curl-8.10.1_2-win64-mingw curl
-      mv ./curl/bin/*.exe ../bin
-      mv ./curl/bin/*.dll ../lib
-      mv ./curl/lib/* ../lib
+      wget https://curl.se/download/curl-8.10.1.zip
+      unzip curl-8.10.1.zip
+      mv curl-8.10.1 curl; cd curl
+        ./configure --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --with-sysroot=/usr/x86_64-w64-mingw32 --enable-optimize --with-schannel --disable-dependency-tracking --disable-static --enable-shared --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-mqtt --disable-manual --disable-docs --disable-sspi --disable-aws --disable-ntlm --disable-unix-sockets --disable-socketpair --disable-dateparse --disable-progress-meter --enable-websockets --without-brotli --without-libssh2 --without-libssh --without-wolfssh --without-librtmp --without-libpsl
+        make
+        cd ..
+      mv ./curl/src/curl.exe ../bin
+      mv ./curl/lib/.libs/libcurl-4.dll ../lib
       mv ./curl/include/* ../include
     cd ..; rm -rf curl
 
@@ -79,7 +109,7 @@ mkdir shared
       wget https://curl.se/download/curl-8.10.1.zip
       unzip curl-8.10.1.zip
       mv curl-8.10.1 curl; cd curl
-        ./configure --enable-optimize --with-openssl --disable-dependency-tracking --disable-shared --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-mqtt --disable-manual --disable-docs --disable-sspi --disable-aws --disable-ntlm --disable-unix-sockets --disable-socketpair --disable-dateparse --disable-progress-meter --enable-websockets --without-brotli --without-libssh2 --without-libssh --without-wolfssh --without-librtmp
+        ./configure --enable-optimize --with-openssl --disable-dependency-tracking --disable-shared --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-mqtt --disable-manual --disable-docs --disable-sspi --disable-aws --disable-ntlm --disable-unix-sockets --disable-socketpair --disable-dateparse --disable-progress-meter --enable-websockets --without-brotli --without-libssh2 --without-libssh --without-wolfssh --without-librtmp --without-libpsl
         make
         cd ..
       mv ./curl/src/curl ../bin
@@ -88,32 +118,3 @@ mkdir shared
     cd ..; rm -rf curl
 
   cd ..
-
-  if command -v apt > /dev/null; then
-
-    echo "Checking for necessary -dev packages..."
-    sudo apt install \
-      libarchive-dev \
-      libxml2-dev \
-      liblzma-dev \
-      libacl1-dev \
-      libgl1-mesa-dev \
-      libxcb*-dev \
-      libfontconfig1-dev \
-      libxkbcommon-x11-dev \
-      libpsl-dev \
-      libnghttp2-dev \
-      libidn2-dev
-
-    echo "Checking for MinGW for cross-compilation..."
-    sudo apt install \
-      mingw-w64 \
-      mingw-w64-tools \
-      gcc-mingw-w64-x86-64 \
-      g++-mingw-w64-x86-64
-
-    echo "Switching to POSIX threads..."
-    sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
-    sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
-
-  fi

setup/setup.iss

@@ -52,7 +52,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: "..\dist\win32\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\win32\archive.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\win32\libcrypto-1_1-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\dist\win32\libcurl-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\dist\win32\libcurl-4.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\win32\libgcc_s_seh-1.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\win32\liblzma.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\win32\libstdc++-6.dll"; DestDir: "{app}"; Flags: ignoreversion

tools/curl.cpp

@@ -61,12 +61,6 @@ bool ToolsCURL::downloadFile (const std::string &url, const std::filesystem::pat
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &ofs);
   curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
 
-#ifdef TARGET_WINDOWS
-  // TODO: Build CURL with Schannel on Windows
-  // This should *NOT* be here in the final release
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-#endif
-
   CURLcode response = curl_easy_perform(curl);
 
   // Clean up CURL
@@ -100,12 +94,6 @@ std::string ToolsCURL::downloadString (const std::string &url) {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
   curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
 
-#ifdef TARGET_WINDOWS
-  // TODO: Build CURL with Schannel on Windows
-  // This should *NOT* be here in the final release
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-#endif
-
   // Perform the request
   CURLcode response = curl_easy_perform(curl);
 
@@ -136,12 +124,6 @@ CURL* ToolsCURL::wsConnect (const std::string &url) {
   curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
   curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L);
 
-#ifdef TARGET_WINDOWS
-  // TODO: Build CURL with Schannel on Windows
-  // This should *NOT* be here in the final release
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-#endif
-
   // Perform the request
   CURLcode response = curl_easy_perform(curl);