Update curl to 8.18

PiperOrigin-RevId: 867833514
Change-Id: Ibbec99aee4c72d19e9d706514f621636b12ae969

Author: laramiel

third_party/curl/config/curl_config.h

@@ -1,21 +1,6 @@
 #ifndef EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_
 #define EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_
 
-#if !defined(_WIN32) && !defined(__APPLE__)
-#include <openssl/opensslv.h>
-#if defined(OPENSSL_IS_BORINGSSL)
-#define HAVE_BORINGSSL 1
-#define HAVE_OPENSSL_CRYPTO_H 1
-#define HAVE_OPENSSL_ERR_H 1
-#define HAVE_OPENSSL_PEM_H 1
-#define HAVE_OPENSSL_PKCS12_H 1
-#define HAVE_OPENSSL_RSA_H 1
-#define HAVE_OPENSSL_SRP 1
-#define HAVE_OPENSSL_SSL_H 1
-#define HAVE_OPENSSL_X509_H 1
-#endif
-#endif
-
 #define CURL_DISABLE_AWS 1
 #define CURL_DISABLE_DICT 1
 #define CURL_DISABLE_FILE 1
@@ -39,6 +24,7 @@
 #define CURL_DISABLE_WEBSOCKETS 1
 
 #define USE_NGHTTP2 1
+#define USE_IPV6 1
 
 #if defined(_WIN32)
 #include "lib/config-win32.h"
@@ -55,7 +41,8 @@
 #define HAVE_SYS_FILIO_H 1
 #define HAVE_SYS_SOCKIO_H 1
 #define CURL_OS "x86_64-apple-darwin15.5.0"
-#define USE_SECTRANSP 1
+#define HAVE_LIBSSL 1
+#define USE_OPENSSL 1
 #else
 /* #  undef CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" */
 #define GETSERVBYPORT_R_ARGS 6
@@ -69,7 +56,6 @@
 #define HAVE_GETHOSTBYNAME_R 1
 #define HAVE_GETHOSTBYNAME_R_6 1
 #define HAVE_GETSERVBYPORT_R 1
-#define HAVE_LIBSSL 1
 #define HAVE_MALLOC_H 1
 #define HAVE_MSG_NOSIGNAL 1
 #define HAVE_LINUX_TCP_H 1
@@ -81,6 +67,7 @@
 #define HAVE_TERMIOS_H 1
 #define CURL_OS "x86_64-pc-linux-gnu"
 #define RANDOM_FILE "/dev/urandom"
+#define HAVE_LIBSSL 1
 #define USE_OPENSSL 1
 #endif
 
@@ -225,16 +212,6 @@
 #define HAVE_ZSTD 1
 #define HAVE_ZSTD_H 1
 #define LT_OBJDIR ".libs/"
-#define PACKAGE "curl"
-#define PACKAGE_BUGREPORT \
-  "a suitable curl mailing list: https://curl.haxx.se/mail/"
-
-
-#define PACKAGE_NAME "curl"
-#define PACKAGE_STRING "curl -"
-#define PACKAGE_TARNAME "curl"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "-"
 #define RECV_TYPE_ARG1 int
 #define RECV_TYPE_ARG2 void*
 #define RECV_TYPE_ARG3 size_t
@@ -264,11 +241,37 @@
 #define STDC_HEADERS 1
 #define STRERROR_R_TYPE_ARG3 size_t
 #define TIME_WITH_SYS_TIME 1
-#define VERSION "-"
 
 #ifndef _DARWIN_USE_64_BIT_INODE
 #define _DARWIN_USE_64_BIT_INODE 1
 #endif
 #endif
 
-#endif  // EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_
+#if defined(HAVE_LIBSSL) && defined(USE_OPENSSL)
+#include <openssl/opensslv.h>
+#if defined(OPENSSL_IS_BORINGSSL)
+#define HAVE_BORINGSSL 1
+#define HAVE_OPENSSL_CRYPTO_H 1
+#define HAVE_OPENSSL_ERR_H 1
+#define HAVE_OPENSSL_PEM_H 1
+#define HAVE_OPENSSL_PKCS12_H 1
+#define HAVE_OPENSSL_RSA_H 1
+#define HAVE_OPENSSL_SRP 1
+#define HAVE_OPENSSL_SSL_H 1
+#define HAVE_OPENSSL_X509_H 1
+// #define HAVE_SSL_SET0_WBIO 1
+// #define HAVE_SSL_SET_QUIC_TLS_CBS 1
+#endif
+#endif
+
+#define PACKAGE "curl"
+#define PACKAGE_NAME "curl"
+#define PACKAGE_STRING "curl -"
+#define PACKAGE_TARNAME "curl"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "-"
+#define VERSION "-"
+#define PACKAGE_BUGREPORT \
+  "a suitable curl mailing list: https://curl.haxx.se/mail/"
+
+#endif  // EXTERNAL_CURL_INCLUDE_CURL_CONFIG_H_

third_party/curl/curl.BUILD.bazel

@@ -60,45 +60,15 @@ LOCAL_DEFINES = (
 
 cc_library(
     name = "curl",
-    srcs = glob(
-               include = [
-                   "lib/**/*.c",
-               ],
-               exclude = [
-                   "lib/socks_sspi.c",
-                   "lib/system_win32.c",
-                   "lib/vauth/spnego_sspi.c",
-                   "lib/vtls/openssl.c",
-                   "lib/vtls/schannel.c",
-                   "lib/vtls/schannel_verify.c",
-                   "lib/vtls/sectransp.c",
-               ],
-           ) +
-           select(
-               {
-                   "@platforms//os:osx": [
-                       "lib/vtls/sectransp.c",
-                   ],
-                   "@platforms//os:ios": [
-                       "lib/vtls/sectransp.c",
-                   ],
-                   "@platforms//os:windows": [
-                       "lib/socks_sspi.c",
-                       "lib/system_win32.c",
-                       "lib/vauth/spnego_sspi.c",
-                       "lib/vtls/schannel.c",
-                       "lib/vtls/schannel_verify.c",
-                   ],
-                   "//conditions:default": [
-                       "lib/vtls/openssl.c",
-                   ],
-               },
-           ),
-    hdrs = glob(
-        [
-            "include/curl/*.h",
-        ],
-    ) + [
+    srcs = glob([
+        "lib/*.c",
+        "lib/vssh/*.c",
+        "lib/vquic/*.c",
+        "lib/vtls/*.c",
+        "lib/vauth/*.c",
+        "lib/curlx/*.c",
+    ]),
+    hdrs = glob(["include/curl/*.h"]) + [
         "include/curl_config.h",
     ],
     copts = select(
@@ -152,6 +122,7 @@ cc_library(
                            "-DEFAULTLIB:crypt32.lib",
                            "-DEFAULTLIB:Normaliz.lib",
                            "-DEFAULTLIB:bcrypt.lib",
+                           "-DEFAULTLIB:Secur32.lib",
                        ],
                        "//conditions:default": [
                            "-lrt",
@@ -166,6 +137,7 @@ cc_library(
                            "-lcrypt32",
                            "-lNormaliz",
                            "-lbcrypt",
+                           "-lSecur32",
                        ],
                        "//conditions:default": [],
                    },

third_party/curl/workspace.bzl

@@ -26,11 +26,11 @@ def repo():
         third_party_http_archive,
         name = "curl",
         doc_name = "curl",
-        doc_version = "8.13.0",
+        doc_version = "8.18.0",
         doc_homepage = "https://curl.se/",
-        strip_prefix = "curl-8.13.0",
-        urls = mirror_url("https://curl.se/download/curl-8.13.0.tar.gz"),
-        sha256 = "c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc",
+        strip_prefix = "curl-8.18.0",
+        urls = mirror_url("https://curl.se/download/curl-8.18.0.tar.gz"),
+        sha256 = "e9274a5f8ab5271c0e0e6762d2fce194d5f98acc568e4ce816845b2dcc0cf88f",
         build_file = Label("//third_party:curl/curl.BUILD.bazel"),
         system_build_file = Label("//third_party:curl/system.BUILD.bazel"),
         cmake_name = "CURL",