Skip to content

Commit 1b257c8

Browse files
gerwoutcopybara-github
authored andcommitted
PR #79955: Update the curl dependency: 8.6.0 -> 8.11.0.
Imported from GitHub PR tensorflow/tensorflow#79955 Due to multiple security vulnerabilities CVE-2024-2004, CVE-2024-2379, CVE-2024-2398, CVE-2024-2466, CVE-2024-6197, CVE-2024-7264, CVE-2024-8096 and CVE-2024-9681 Copybara import of the project: -- f05738b11ff2a6654ef5460d9dac8c6795c04ac6 by Gerwout van der Veen <[email protected]>: Update the curl dependency: 8.6.0 -> 8.11.0. Due to multiple security vulnerabilities CVE-2024-2004, CVE-2024-2379, CVE-2024-2398, CVE-2024-2466, CVE-2024-6197, CVE-2024-7264, CVE-2024-8096 and CVE-2024-9681 -- b5ce0879ff980d61089c74257f450419d8d167cf by Gerwout van der Veen <[email protected]>: buildifier formatting Merging this change closes #79955 PiperOrigin-RevId: 696661168
1 parent 8f72cbc commit 1b257c8

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

third_party/curl.BUILD

+17-6
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ cc_library(
9797
"lib/curl_multibyte.h",
9898
"lib/curl_ntlm_core.c",
9999
"lib/curl_ntlm_core.h",
100-
"lib/curl_ntlm_wb.c",
101-
"lib/curl_ntlm_wb.h",
102-
"lib/curl_path.c",
103-
"lib/curl_path.h",
104100
"lib/curl_printf.h",
105101
"lib/curl_range.c",
106102
"lib/curl_range.h",
@@ -111,15 +107,20 @@ cc_library(
111107
"lib/curl_setup.h",
112108
"lib/curl_setup_once.h",
113109
"lib/curl_sha256.h",
110+
"lib/curl_sha512_256.c",
111+
"lib/curl_sha512_256.h",
114112
"lib/curl_sspi.c",
115113
"lib/curl_sspi.h",
116114
"lib/curl_threads.c",
117115
"lib/curl_threads.h",
118116
"lib/curl_trc.c",
119117
"lib/curl_trc.h",
120118
"lib/curlx.h",
119+
"lib/cw-out.c",
120+
"lib/cw-out.h",
121121
"lib/dict.c",
122122
"lib/dict.h",
123+
"lib/dllmain.c",
123124
"lib/doh.c",
124125
"lib/doh.h",
125126
"lib/dynbuf.c",
@@ -231,6 +232,8 @@ cc_library(
231232
"lib/rand.h",
232233
"lib/rename.c",
233234
"lib/rename.h",
235+
"lib/request.c",
236+
"lib/request.h",
234237
"lib/rtsp.c",
235238
"lib/rtsp.h",
236239
"lib/select.c",
@@ -317,12 +320,16 @@ cc_library(
317320
"lib/vquic/vquic.c",
318321
"lib/vquic/vquic.h",
319322
"lib/vquic/vquic_int.h",
323+
"lib/vssh/curl_path.c",
324+
"lib/vssh/curl_path.h",
320325
"lib/vssh/libssh.c",
321326
"lib/vssh/libssh2.c",
322327
"lib/vssh/ssh.h",
323328
"lib/vssh/wolfssh.c",
324329
"lib/vtls/bearssl.c",
325330
"lib/vtls/bearssl.h",
331+
"lib/vtls/cipher_suite.c",
332+
"lib/vtls/cipher_suite.h",
326333
"lib/vtls/gtls.c",
327334
"lib/vtls/gtls.h",
328335
"lib/vtls/hostcheck.c",
@@ -452,6 +459,8 @@ cc_binary(
452459
"lib/config-win32.h",
453460
"src/slist_wc.c",
454461
"src/slist_wc.h",
462+
"src/terminal.c",
463+
"src/terminal.h",
455464
"src/tool_binmode.c",
456465
"src/tool_binmode.h",
457466
"src/tool_bname.c",
@@ -466,6 +475,8 @@ cc_binary(
466475
"src/tool_cb_rea.h",
467476
"src/tool_cb_see.c",
468477
"src/tool_cb_see.h",
478+
"src/tool_cb_soc.c",
479+
"src/tool_cb_soc.h",
469480
"src/tool_cb_wrt.c",
470481
"src/tool_cb_wrt.h",
471482
"src/tool_cfgable.c",
@@ -591,7 +602,7 @@ genrule(
591602
"# define HAVE_SETMODE 1",
592603
"# define HAVE_SYS_FILIO_H 1",
593604
"# define HAVE_SYS_SOCKIO_H 1",
594-
"# define OS \"x86_64-apple-darwin15.5.0\"",
605+
"# define CURL_OS \"x86_64-apple-darwin15.5.0\"",
595606
"# define USE_SECTRANSP 1",
596607
"#else",
597608
"# define CURL_CA_BUNDLE \"/etc/ssl/certs/ca-certificates.crt\"",
@@ -620,7 +631,7 @@ genrule(
620631
"# define HAVE_RAND_STATUS 1",
621632
"# define HAVE_SSL_GET_SHUTDOWN 1",
622633
"# define HAVE_TERMIOS_H 1",
623-
"# define OS \"x86_64-pc-linux-gnu\"",
634+
"# define CURL_OS \"x86_64-pc-linux-gnu\"",
624635
"# define RANDOM_FILE \"/dev/urandom\"",
625636
"# define USE_OPENSSL 1",
626637
"#endif",

tsl/platform/cloud/curl_http_request_test.cc

+3-5
Original file line numberDiff line numberDiff line change
@@ -497,11 +497,9 @@ TEST(CurlHttpRequestTest, GetRequest_CouldntResolveHost) {
497497
const auto& status = http_request.Send();
498498
EXPECT_EQ(error::FAILED_PRECONDITION, status.code());
499499
EXPECT_EQ(
500-
absl::StrCat(
501-
"Error executing an HTTP request: libcurl code 6 meaning ",
502-
(kIsOpenSource ? "'Couldn't resolve host name', error details: "
503-
: "'Could not resolve hostname', error details: "),
504-
"Could not resolve host ", "'metadata'"),
500+
absl::StrCat("Error executing an HTTP request: libcurl code 6 meaning ",
501+
"'Could not resolve hostname', error details: ",
502+
"Could not resolve host ", "'metadata'"),
505503
status.message());
506504
EXPECT_EQ(0, http_request.GetResponseCode());
507505
}

workspace2.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ def _tf_repositories():
323323
tf_http_archive(
324324
name = "curl",
325325
build_file = "//third_party:curl.BUILD",
326-
sha256 = "9c6db808160015f30f3c656c0dec125feb9dc00753596bf858a272b5dd8dc398",
327-
strip_prefix = "curl-8.6.0",
326+
sha256 = "264537d90e58d2b09dddc50944baf3c38e7089151c8986715e2aaeaaf2b8118f",
327+
strip_prefix = "curl-8.11.0",
328328
system_build_file = "//third_party/systemlibs:curl.BUILD",
329-
urls = tf_mirror_urls("https://curl.se/download/curl-8.6.0.tar.gz"),
329+
urls = tf_mirror_urls("https://curl.se/download/curl-8.11.0.tar.gz"),
330330
)
331331

332332
# WARNING: make sure ncteisen@ and vpai@ are cc-ed on any CL to change the below rule

0 commit comments

Comments
 (0)