From f6563ae0b8b465a6249bf010db031b09ee54f04e Mon Sep 17 00:00:00 2001
From: Simonx22 <simon@oatmealdome.me>
Date: Sun, 9 Nov 2025 00:41:21 -0500
Subject: [PATCH] curl: Update to 8.15.0

The bug in CVE-2025-0665 causes crashes on Android 11 and above, as the default fdsan behavior was changed to abort when a violation is found.

While curl 8.17.0 is the latest release, we can't upgrade to it right now due to mbedtls 2.28.0 (which we are currently using) being incompatible with it.

Co-Authored-By: OatmealDome <OatmealDome@users.noreply.github.com>
---
 Externals/curl/curl          |  2 +-
 Externals/curl/curl.vcxproj  | 89 +++++++++++++++++++-----------------
 Externals/curl/exports.props |  3 ++
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/Externals/curl/curl b/Externals/curl/curl
index 75a2079d5c2..cfbfb65047e 160000
--- a/Externals/curl/curl
+++ b/Externals/curl/curl
@@ -1 +1 @@
-Subproject commit 75a2079d5c28debb2eaa848ca9430f1fe0d7844c
+Subproject commit cfbfb65047e85e6b08af65fe9cdbcf68e9ad496a
diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj
index 205bf651297..553c446bda6 100644
--- a/Externals/curl/curl.vcxproj
+++ b/Externals/curl/curl.vcxproj
@@ -25,11 +25,11 @@
     <ClCompile Include="curl\lib\altsvc.c" />
     <ClCompile Include="curl\lib\amigaos.c" />
     <ClCompile Include="curl\lib\asyn-ares.c" />
-    <ClCompile Include="curl\lib\asyn-thread.c" />
-    <ClCompile Include="curl\lib\base64.c" />
+    <ClCompile Include="curl\lib\asyn-base.c" />
+    <ClCompile Include="curl\lib\asyn-thrdd.c" />
+    <ClCompile Include="curl\lib\curlx\base64.c" />
     <ClCompile Include="curl\lib\bufq.c" />
     <ClCompile Include="curl\lib\bufref.c" />
-    <ClCompile Include="curl\lib\c-hyper.c" />
     <ClCompile Include="curl\lib\cf-h1-proxy.c" />
     <ClCompile Include="curl\lib\cf-h2-proxy.c" />
     <ClCompile Include="curl\lib\cf-haproxy.c" />
@@ -37,6 +37,7 @@
     <ClCompile Include="curl\lib\cf-socket.c" />
     <ClCompile Include="curl\lib\cfilters.c" />
     <ClCompile Include="curl\lib\conncache.c" />
+    <ClCompile Include="curl\lib\cshutdn.c" />
     <ClCompile Include="curl\lib\connect.c" />
     <ClCompile Include="curl\lib\content_encoding.c" />
     <ClCompile Include="curl\lib\cookie.c" />
@@ -48,7 +49,7 @@
     <ClCompile Include="curl\lib\curl_get_line.c" />
     <ClCompile Include="curl\lib\curl_gssapi.c" />
     <ClCompile Include="curl\lib\curl_memrchr.c" />
-    <ClCompile Include="curl\lib\curl_multibyte.c" />
+    <ClCompile Include="curl\lib\curlx\multibyte.c" />
     <ClCompile Include="curl\lib\curl_ntlm_core.c" />
     <ClCompile Include="curl\lib\curl_range.c" />
     <ClCompile Include="curl\lib\curl_rtmp.c" />
@@ -58,9 +59,10 @@
     <ClCompile Include="curl\lib\curl_threads.c" />
     <ClCompile Include="curl\lib\curl_trc.c" />
     <ClCompile Include="curl\lib\cw-out.c" />
+    <ClCompile Include="curl\lib\cw-pause.c" />
     <ClCompile Include="curl\lib\dict.c" />
     <ClCompile Include="curl\lib\doh.c" />
-    <ClCompile Include="curl\lib\dynbuf.c" />
+    <ClCompile Include="curl\lib\curlx\dynbuf.c" />
     <ClCompile Include="curl\lib\dynhds.c" />
     <ClCompile Include="curl\lib\easy.c" />
     <ClCompile Include="curl\lib\easygetopt.c" />
@@ -78,11 +80,9 @@
     <ClCompile Include="curl\lib\hash.c" />
     <ClCompile Include="curl\lib\headers.c" />
     <ClCompile Include="curl\lib\hmac.c" />
-    <ClCompile Include="curl\lib\hostasyn.c" />
     <ClCompile Include="curl\lib\hostip.c" />
     <ClCompile Include="curl\lib\hostip4.c" />
     <ClCompile Include="curl\lib\hostip6.c" />
-    <ClCompile Include="curl\lib\hostsyn.c" />
     <ClCompile Include="curl\lib\hsts.c" />
     <ClCompile Include="curl\lib\http.c" />
     <ClCompile Include="curl\lib\http1.c" />
@@ -96,8 +96,8 @@
     <ClCompile Include="curl\lib\idn.c" />
     <ClCompile Include="curl\lib\if2ip.c" />
     <ClCompile Include="curl\lib\imap.c" />
-    <ClCompile Include="curl\lib\inet_ntop.c" />
-    <ClCompile Include="curl\lib\inet_pton.c" />
+    <ClCompile Include="curl\lib\curlx\inet_ntop.c" />
+    <ClCompile Include="curl\lib\curlx\inet_pton.c" />
     <ClCompile Include="curl\lib\krb5.c" />
     <ClCompile Include="curl\lib\ldap.c" />
     <ClCompile Include="curl\lib\llist.c" />
@@ -109,8 +109,8 @@
     <ClCompile Include="curl\lib\mprintf.c" />
     <ClCompile Include="curl\lib\mqtt.c" />
     <ClCompile Include="curl\lib\multi.c" />
+    <ClCompile Include="curl\lib\multi_ev.c" />
     <ClCompile Include="curl\lib\netrc.c" />
-    <ClCompile Include="curl\lib\nonblock.c" />
     <ClCompile Include="curl\lib\noproxy.c" />
     <ClCompile Include="curl\lib\openldap.c" />
     <ClCompile Include="curl\lib\parsedate.c" />
@@ -139,19 +139,22 @@
     <ClCompile Include="curl\lib\strcase.c" />
     <ClCompile Include="curl\lib\strdup.c" />
     <ClCompile Include="curl\lib\strerror.c" />
-    <ClCompile Include="curl\lib\strtok.c" />
-    <ClCompile Include="curl\lib\strtoofft.c" />
+    <ClCompile Include="curl\lib\strequal.c" />
     <ClCompile Include="curl\lib\system_win32.c" />
     <ClCompile Include="curl\lib\telnet.c" />
     <ClCompile Include="curl\lib\tftp.c" />
-    <ClCompile Include="curl\lib\timediff.c" />
-    <ClCompile Include="curl\lib\timeval.c" />
+    <ClCompile Include="curl\lib\curlx\timediff.c" />
+    <ClCompile Include="curl\lib\curlx\timeval.c" />
     <ClCompile Include="curl\lib\transfer.c" />
     <ClCompile Include="curl\lib\url.c" />
     <ClCompile Include="curl\lib\urlapi.c" />
     <ClCompile Include="curl\lib\version.c" />
-    <ClCompile Include="curl\lib\version_win32.c" />
-    <ClCompile Include="curl\lib\warnless.c" />
+    <ClCompile Include="curl\lib\curlx\version_win32.c" />
+    <ClCompile Include="curl\lib\curlx\winapi.c" />
+    <ClCompile Include="curl\lib\curlx\warnless.c" />
+    <ClCompile Include="curl\lib\curlx\nonblock.c" />
+    <ClCompile Include="curl\lib\curlx\strparse.c" />
+    <ClCompile Include="curl\lib\curlx\wait.c" />
     <ClCompile Include="curl\lib\ws.c" />
     <ClCompile Include="curl\lib\vauth\cleartext.c" />
     <ClCompile Include="curl\lib\vauth\cram.c" />
@@ -166,6 +169,9 @@
     <ClCompile Include="curl\lib\vauth\spnego_gssapi.c" />
     <ClCompile Include="curl\lib\vauth\spnego_sspi.c" />
     <ClCompile Include="curl\lib\vauth\vauth.c" />
+    <ClCompile Include="curl\lib\uint-bset.c" />
+    <ClCompile Include="curl\lib\uint-spbset.c" />
+    <ClCompile Include="curl\lib\uint-table.c" />
     <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
     <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
     <ClCompile Include="curl\lib\vquic\curl_osslq.c" />
@@ -176,7 +182,6 @@
     <ClCompile Include="curl\lib\vssh\libssh.c" />
     <ClCompile Include="curl\lib\vssh\libssh2.c" />
     <ClCompile Include="curl\lib\vssh\wolfssh.c" />
-    <ClCompile Include="curl\lib\vtls\bearssl.c" />
     <ClCompile Include="curl\lib\vtls\cipher_suite.c" />
     <ClCompile Include="curl\lib\vtls\gtls.c" />
     <ClCompile Include="curl\lib\vtls\hostcheck.c" />
@@ -187,8 +192,8 @@
     <ClCompile Include="curl\lib\vtls\rustls.c" />
     <ClCompile Include="curl\lib\vtls\schannel.c" />
     <ClCompile Include="curl\lib\vtls\schannel_verify.c" />
-    <ClCompile Include="curl\lib\vtls\sectransp.c" />
     <ClCompile Include="curl\lib\vtls\vtls.c" />
+    <ClCompile Include="curl\lib\vtls\vtls_scache.c" />
     <ClCompile Include="curl\lib\vtls\wolfssl.c" />
     <ClCompile Include="curl\lib\vtls\x509asn1.c" />
   </ItemGroup>
@@ -211,28 +216,28 @@
     <ClInclude Include="curl\lib\asyn.h" />
     <ClInclude Include="curl\lib\bufq.h" />
     <ClInclude Include="curl\lib\bufref.h" />
-    <ClInclude Include="curl\lib\c-hyper.h" />
     <ClInclude Include="curl\lib\cf-h1-proxy.h" />
     <ClInclude Include="curl\lib\cf-h2-proxy.h" />
     <ClInclude Include="curl\lib\cf-haproxy.h" />
     <ClInclude Include="curl\lib\cf-https-connect.h" />
     <ClInclude Include="curl\lib\cf-socket.h" />
     <ClInclude Include="curl\lib\cfilters.h" />
-    <ClInclude Include="curl\lib\config-amigaos.h" />
-    <ClInclude Include="curl\lib\config-dos.h" />
     <ClInclude Include="curl\lib\config-mac.h" />
     <ClInclude Include="curl\lib\config-os400.h" />
     <ClInclude Include="curl\lib\config-plan9.h" />
     <ClInclude Include="curl\lib\config-riscos.h" />
     <ClInclude Include="curl\lib\config-win32.h" />
-    <ClInclude Include="curl\lib\config-win32ce.h" />
     <ClInclude Include="curl\lib\conncache.h" />
+    <ClInclude Include="curl\lib\cshutdn.h" />
+    <ClInclude Include="curl\lib\uint-bset.h" />
+    <ClInclude Include="curl\lib\uint-spbset.h" />
+    <ClInclude Include="curl\lib\uint-table.h" />
     <ClInclude Include="curl\lib\connect.h" />
     <ClInclude Include="curl\lib\content_encoding.h" />
     <ClInclude Include="curl\lib\cookie.h" />
-    <ClInclude Include="curl\lib\curlx.h" />
+    <ClInclude Include="curl\lib\curlx\curlx.h" />
     <ClInclude Include="curl\lib\curl_addrinfo.h" />
-    <ClInclude Include="curl\lib\curl_base64.h" />
+    <ClInclude Include="curl\lib\curlx\base64.h" />
     <ClInclude Include="curl\lib\curl_ctype.h" />
     <ClInclude Include="curl\lib\curl_des.h" />
     <ClInclude Include="curl\lib\curl_endian.h" />
@@ -247,7 +252,7 @@
     <ClInclude Include="curl\lib\curl_md5.h" />
     <ClInclude Include="curl\lib\curl_memory.h" />
     <ClInclude Include="curl\lib\curl_memrchr.h" />
-    <ClInclude Include="curl\lib\curl_multibyte.h" />
+    <ClInclude Include="curl\lib\curlx\multibyte.h" />
     <ClInclude Include="curl\lib\curl_ntlm_core.h" />
     <ClInclude Include="curl\lib\curl_printf.h" />
     <ClInclude Include="curl\lib\curl_range.h" />
@@ -260,10 +265,11 @@
     <ClInclude Include="curl\lib\curl_sspi.h" />
     <ClInclude Include="curl\lib\curl_threads.h" />
     <ClInclude Include="curl\lib\curl_trc.h" />
-    <ClInclude Include="curl\lib\cw_out.h" />
+    <ClInclude Include="curl\lib\cw-out.h" />
+    <ClInclude Include="curl\lib\cw-pause.h" />
     <ClInclude Include="curl\lib\dict.h" />
     <ClInclude Include="curl\lib\doh.h" />
-    <ClInclude Include="curl\lib\dynbuf.h" />
+    <ClInclude Include="curl\lib\curlx\dynbuf.h" />
     <ClInclude Include="curl\lib\dynhds.h" />
     <ClInclude Include="curl\lib\easyif.h" />
     <ClInclude Include="curl\lib\easyoptions.h" />
@@ -294,8 +300,8 @@
     <ClInclude Include="curl\lib\idn.h" />
     <ClInclude Include="curl\lib\if2ip.h" />
     <ClInclude Include="curl\lib\imap.h" />
-    <ClInclude Include="curl\lib\inet_ntop.h" />
-    <ClInclude Include="curl\lib\inet_pton.h" />
+    <ClInclude Include="curl\lib\curlx\inet_ntop.h" />
+    <ClInclude Include="curl\lib\curlx\inet_pton.h" />
     <ClInclude Include="curl\lib\llist.h" />
     <ClInclude Include="curl\lib\macos.h" />
     <ClInclude Include="curl\lib\memdebug.h" />
@@ -303,8 +309,8 @@
     <ClInclude Include="curl\lib\mqtt.h" />
     <ClInclude Include="curl\lib\multihandle.h" />
     <ClInclude Include="curl\lib\multiif.h" />
+    <ClInclude Include="curl\lib\multi_ev.h" />
     <ClInclude Include="curl\lib\netrc.h" />
-    <ClInclude Include="curl\lib\nonblock.h" />
     <ClInclude Include="curl\lib\noproxy.h" />
     <ClInclude Include="curl\lib\parsedate.h" />
     <ClInclude Include="curl\lib\pingpong.h" />
@@ -334,22 +340,24 @@
     <ClInclude Include="curl\lib\strcase.h" />
     <ClInclude Include="curl\lib\strdup.h" />
     <ClInclude Include="curl\lib\strerror.h" />
-    <ClInclude Include="curl\lib\strtok.h" />
-    <ClInclude Include="curl\lib\strtoofft.h" />
+    <ClInclude Include="curl\lib\strequal.h" />
     <ClInclude Include="curl\lib\system_win32.h" />
     <ClInclude Include="curl\lib\telnet.h" />
     <ClInclude Include="curl\lib\tftp.h" />
-    <ClInclude Include="curl\lib\timediff.h" />
-    <ClInclude Include="curl\lib\timeval.h" />
+    <ClInclude Include="curl\lib\curlx\timediff.h" />
+    <ClInclude Include="curl\lib\curlx\timeval.h" />
+    <ClInclude Include="curl\lib\curlx\strparse.h" />
+    <ClInclude Include="curl\lib\curlx\wait.h" />
+    <ClInclude Include="curl\lib\curlx\nonblock.h" />
     <ClInclude Include="curl\lib\transfer.h" />
     <ClInclude Include="curl\lib\url.h" />
     <ClInclude Include="curl\lib\urlapi-int.h" />
     <ClInclude Include="curl\lib\urldata.h" />
-    <ClInclude Include="curl\lib\version_win32.h" />
-    <ClInclude Include="curl\lib\warnless.h" />
+    <ClInclude Include="curl\lib\curlx\version_win32.h" />
+    <ClInclude Include="curl\lib\curlx\winapi.h" />
+    <ClInclude Include="curl\lib\curlx\warnless.h" />
     <ClInclude Include="curl\lib\ws.h" />
     <ClInclude Include="curl\lib\vauth\digest.h" />
-    <ClInclude Include="curl\lib\vauth\ntlm.h" />
     <ClInclude Include="curl\lib\vauth\vauth.h" />
     <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
     <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
@@ -360,8 +368,7 @@
     <ClInclude Include="curl\lib\vquic\vquic_int.h" />
     <ClInclude Include="curl\lib\vssh\curl_path.h" />
     <ClInclude Include="curl\lib\vssh\ssh.h" />
-    <ClInclude Include="curl\lib\vtls\bearssl.h" />
-    <ClInclude Include="curl\lib\vtls\cipher_suites.h" />
+    <ClInclude Include="curl\lib\vtls\cipher_suite.h" />
     <ClInclude Include="curl\lib\vtls\gtls.h" />
     <ClInclude Include="curl\lib\vtls\hostcheck.h" />
     <ClInclude Include="curl\lib\vtls\keylog.h" />
@@ -371,8 +378,8 @@
     <ClInclude Include="curl\lib\vtls\rustls.h" />
     <ClInclude Include="curl\lib\vtls\schannel.h" />
     <ClInclude Include="curl\lib\vtls\schannel_int.h" />
-    <ClInclude Include="curl\lib\vtls\sectransp.h" />
     <ClInclude Include="curl\lib\vtls\vtls.h" />
+    <ClInclude Include="curl\lib\vtls\vtls_scache.h" />
     <ClInclude Include="curl\lib\vtls\vtls_int.h" />
     <ClInclude Include="curl\lib\vtls\wolfssl.h" />
     <ClInclude Include="curl\lib\vtls\x509asn1.h" />
@@ -380,4 +387,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Externals/curl/exports.props b/Externals/curl/exports.props
index f78f55e3fed..5b923bc635c 100644
--- a/Externals/curl/exports.props
+++ b/Externals/curl/exports.props
@@ -5,6 +5,9 @@
       <AdditionalIncludeDirectories>$(ExternalsDir)curl\curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <Link>
+      <AdditionalDependencies>secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="$(ExternalsDir)curl\curl.vcxproj">