⬆️ Upgrade curl to 7.85.0

The following patches from upstream are used:
```
--- a/lib/curl/lib/curl_setup_once.h
+++ b/lib/curl/lib/curl_setup_once.h
@@ -86,6 +86,7 @@

 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#include <sys/un.h>
 #endif

 #ifdef __hpux
@@ -269,6 +270,10 @@
 #endif

 /* the type we use for storing a single boolean bit */
+#ifdef BIT
+#undef BIT
+#endif
+
 #ifdef _MSC_VER
 typedef bool bit;
 #define BIT(x) bool x
--- a/lib/curl/lib/rand.c
+++ b/lib/curl/lib/rand.c
@@ -31,6 +31,7 @@
 #include <curl/curl.h>
 #include "vtls/vtls.h"
 #include "sendf.h"
+#include "timeval.h"
 #include "rand.h"

 /* The last 3 #include files should be in this order */
--- a/lib/curl/lib/vtls/mbedtls.c
+++ b/lib/curl/lib/vtls/mbedtls.c
@@ -191,7 +191,7 @@
     case CURL_SSLVERSION_TLSv1_0:
     case CURL_SSLVERSION_TLSv1_1:
     case CURL_SSLVERSION_TLSv1_2:
-      *mbedver = MBEDTLS_SSL_MINOR_VERSION_3;
+      *mbedver = 3 /* MBEDTLS_SSL_MINOR_VERSION_3 */;
       return CURLE_OK;
     case CURL_SSLVERSION_TLSv1_3:
       break;
@@ -222,8 +222,8 @@
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
   struct ssl_backend_data *backend = connssl->backend;
 #if MBEDTLS_VERSION_NUMBER >= 0x03000000
-  int mbedtls_ver_min = MBEDTLS_SSL_MINOR_VERSION_3;
-  int mbedtls_ver_max = MBEDTLS_SSL_MINOR_VERSION_3;
+  int mbedtls_ver_min = 3 /* MBEDTLS_SSL_MINOR_VERSION_3 */;
+  int mbedtls_ver_max = 3 /* MBEDTLS_SSL_MINOR_VERSION_3 */;
 #else
   int mbedtls_ver_min = MBEDTLS_SSL_MINOR_VERSION_1;
   int mbedtls_ver_max = MBEDTLS_SSL_MINOR_VERSION_1;
@@ -259,10 +259,15 @@
     return result;
   }

+#if MBEDTLS_VERSION_NUMBER >= 0x03000000
+  mbedtls_ssl_conf_min_tls_version(&backend->config, MBEDTLS_SSL_VERSION_TLS1_2);
+  mbedtls_ssl_conf_max_tls_version(&backend->config, MBEDTLS_SSL_VERSION_TLS1_2);
+#else
   mbedtls_ssl_conf_min_version(&backend->config, MBEDTLS_SSL_MAJOR_VERSION_3,
                                mbedtls_ver_min);
   mbedtls_ssl_conf_max_version(&backend->config, MBEDTLS_SSL_MAJOR_VERSION_3,
                                mbedtls_ver_max);
+#endif

   return result;
 }
--- a/lib/curl/lib/vtls/vtls.h
+++ b/lib/curl/lib/vtls/vtls.h
@@ -128,16 +128,7 @@
 CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name,
                                    const curl_ssl_backend ***avail);

-#include "openssl.h"        /* OpenSSL versions */
-#include "gtls.h"           /* GnuTLS versions */
-#include "nssg.h"           /* NSS versions */
-#include "gskit.h"          /* Global Secure ToolKit versions */
-#include "wolfssl.h"        /* wolfSSL versions */
-#include "schannel.h"       /* Schannel SSPI version */
-#include "sectransp.h"      /* SecureTransport (Darwin) version */
 #include "mbedtls.h"        /* mbedTLS versions */
-#include "bearssl.h"        /* BearSSL versions */
-#include "rustls.h"         /* rustls versions */

 #ifndef MAX_PINNED_PUBKEY_SIZE
 #define MAX_PINNED_PUBKEY_SIZE 1048576 /* 1MB */
```

Author: paulreimer

curl/CMakeLists.txt

@@ -1,129 +1,64 @@
 idf_component_register(
   SRCS
-    "lib/curl/lib/amigaos.c"
-    "lib/curl/lib/asyn-ares.c"
-    "lib/curl/lib/asyn-thread.c"
+    "lib/curl/lib/altsvc.c"
     "lib/curl/lib/base64.c"
     "lib/curl/lib/conncache.c"
     "lib/curl/lib/connect.c"
     "lib/curl/lib/content_encoding.c"
     "lib/curl/lib/cookie.c"
     "lib/curl/lib/curl_addrinfo.c"
-    "lib/curl/lib/curl_des.c"
-    "lib/curl/lib/curl_endian.c"
-    "lib/curl/lib/curl_fnmatch.c"
-    "lib/curl/lib/curl_gethostname.c"
-    "lib/curl/lib/curl_gssapi.c"
-    "lib/curl/lib/curl_memrchr.c"
-    "lib/curl/lib/curl_multibyte.c"
-    "lib/curl/lib/curl_ntlm_core.c"
-    "lib/curl/lib/curl_ntlm_wb.c"
-    "lib/curl/lib/curl_path.c"
-    "lib/curl/lib/curl_rtmp.c"
-    "lib/curl/lib/curl_sasl.c"
-    "lib/curl/lib/curl_sspi.c"
-    "lib/curl/lib/curl_threads.c"
-    "lib/curl/lib/dict.c"
+    "lib/curl/lib/curl_ctype.c"
+    "lib/curl/lib/curl_get_line.c"
+    "lib/curl/lib/doh.c"
     "lib/curl/lib/dotdot.c"
+    "lib/curl/lib/dynbuf.c"
     "lib/curl/lib/easy.c"
     "lib/curl/lib/escape.c"
-    "lib/curl/lib/file.c"
-    "lib/curl/lib/fileinfo.c"
+    "lib/curl/lib/fopen.c"
     "lib/curl/lib/formdata.c"
-    "lib/curl/lib/ftp.c"
-    "lib/curl/lib/ftplistparser.c"
     "lib/curl/lib/getenv.c"
     "lib/curl/lib/getinfo.c"
-    "lib/curl/lib/gopher.c"
     "lib/curl/lib/hash.c"
-    "lib/curl/lib/hmac.c"
-    "lib/curl/lib/hostasyn.c"
-    "lib/curl/lib/hostcheck.c"
+    "lib/curl/lib/headers.c"
     "lib/curl/lib/hostip.c"
     "lib/curl/lib/hostip4.c"
     "lib/curl/lib/hostip6.c"
-    "lib/curl/lib/hostsyn.c"
+    "lib/curl/lib/hsts.c"
     "lib/curl/lib/http.c"
-    "lib/curl/lib/http2.c"
     "lib/curl/lib/http_chunks.c"
-    "lib/curl/lib/http_digest.c"
-    "lib/curl/lib/http_negotiate.c"
-    "lib/curl/lib/http_ntlm.c"
     "lib/curl/lib/http_proxy.c"
-    "lib/curl/lib/idn_win32.c"
     "lib/curl/lib/if2ip.c"
-    "lib/curl/lib/imap.c"
-    "lib/curl/lib/inet_ntop.c"
-    "lib/curl/lib/inet_pton.c"
-    "lib/curl/lib/krb5.c"
-    "lib/curl/lib/ldap.c"
     "lib/curl/lib/llist.c"
-    "lib/curl/lib/md4.c"
-    "lib/curl/lib/md5.c"
-    "lib/curl/lib/memdebug.c"
     "lib/curl/lib/mime.c"
     "lib/curl/lib/mprintf.c"
+    "lib/curl/lib/mqtt.c"
     "lib/curl/lib/multi.c"
     "lib/curl/lib/netrc.c"
-    "lib/curl/lib/non-ascii.c"
     "lib/curl/lib/nonblock.c"
-    "lib/curl/lib/nwlib.c"
-    "lib/curl/lib/nwos.c"
-    "lib/curl/lib/openldap.c"
     "lib/curl/lib/parsedate.c"
-    "lib/curl/lib/pingpong.c"
-    "lib/curl/lib/pipeline.c"
-    "lib/curl/lib/pop3.c"
     "lib/curl/lib/progress.c"
     "lib/curl/lib/rand.c"
-    "lib/curl/lib/rtsp.c"
-    "lib/curl/lib/security.c"
+    "lib/curl/lib/rename.c"
     "lib/curl/lib/select.c"
     "lib/curl/lib/sendf.c"
     "lib/curl/lib/setopt.c"
-    "lib/curl/lib/sha256.c"
     "lib/curl/lib/share.c"
     "lib/curl/lib/slist.c"
-    "lib/curl/lib/smb.c"
-    "lib/curl/lib/smtp.c"
-    "lib/curl/lib/socks.c"
-    "lib/curl/lib/socks_gssapi.c"
-    "lib/curl/lib/socks_sspi.c"
+    "lib/curl/lib/socketpair.c"
     "lib/curl/lib/speedcheck.c"
     "lib/curl/lib/splay.c"
-    "lib/curl/lib/ssh-libssh.c"
-    "lib/curl/lib/ssh.c"
     "lib/curl/lib/strcase.c"
     "lib/curl/lib/strdup.c"
     "lib/curl/lib/strerror.c"
-    "lib/curl/lib/strtok.c"
     "lib/curl/lib/strtoofft.c"
-    "lib/curl/lib/system_win32.c"
-    "lib/curl/lib/telnet.c"
-    "lib/curl/lib/tftp.c"
+    "lib/curl/lib/timediff.c"
     "lib/curl/lib/timeval.c"
     "lib/curl/lib/transfer.c"
     "lib/curl/lib/url.c"
-    "lib/curl/lib/vauth/cleartext.c"
-    "lib/curl/lib/vauth/cram.c"
-    "lib/curl/lib/vauth/digest.c"
-    "lib/curl/lib/vauth/digest_sspi.c"
-    "lib/curl/lib/vauth/krb5_gssapi.c"
-    "lib/curl/lib/vauth/krb5_sspi.c"
-    "lib/curl/lib/vauth/ntlm.c"
-    "lib/curl/lib/vauth/ntlm_sspi.c"
-    "lib/curl/lib/vauth/oauth2.c"
-    "lib/curl/lib/vauth/spnego_gssapi.c"
-    "lib/curl/lib/vauth/spnego_sspi.c"
-    "lib/curl/lib/vauth/vauth.c"
-    "lib/curl/lib/version.c"
-    "lib/curl/lib/vtls/gskit.c"
+    "lib/curl/lib/urlapi.c"
     "lib/curl/lib/vtls/mbedtls.c"
-    "lib/curl/lib/vtls/polarssl_threadlock.c"
     "lib/curl/lib/vtls/vtls.c"
     "lib/curl/lib/warnless.c"
-    "lib/curl/lib/wildcard.c"
-    "lib/curl/lib/x509asn1.c"
     "lib/posix_shims.c"
     "lib/zlib/adler32.c"
     "lib/zlib/compress.c"

curl/lib/curl/COPYING

@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1996 - 2018, Daniel Stenberg, <[email protected]>, and many
+Copyright (c) 1996 - 2022, Daniel Stenberg, <[email protected]>, and many
 contributors, see the THANKS file.
 
 All rights reserved.