Skip to content

Commit e41316e

Browse files
committed
upgrade curl version to 7.74 for CVEs
1 parent 582c8d2 commit e41316e

File tree

2 files changed

+98
-23
lines changed

2 files changed

+98
-23
lines changed

tensorflow/workspace.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,12 +638,12 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
638638
tf_http_archive(
639639
name = "curl",
640640
build_file = clean_dep("//third_party:curl.BUILD"),
641-
sha256 = "01ae0c123dee45b01bbaef94c0bc00ed2aec89cb2ee0fd598e0d302a6b5e0a98",
642-
strip_prefix = "curl-7.69.1",
641+
sha256 = "e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7",
642+
strip_prefix = "curl-7.74.0",
643643
system_build_file = clean_dep("//third_party/systemlibs:curl.BUILD"),
644644
urls = [
645-
"https://storage.googleapis.com/mirror.tensorflow.org/curl.haxx.se/download/curl-7.69.1.tar.gz",
646-
"https://curl.haxx.se/download/curl-7.69.1.tar.gz",
645+
"https://storage.googleapis.com/mirror.tensorflow.org/curl.haxx.se/download/curl-7.74.0.tar.gz",
646+
"https://curl.haxx.se/download/curl-7.74.0.tar.gz",
647647
],
648648
)
649649

third_party/curl.BUILD

Lines changed: 94 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,24 @@ cc_library(
3535
name = "curl",
3636
srcs = [
3737
"include/curl_config.h",
38+
"lib/altsvc.c",
39+
"lib/altsvc.h",
40+
"lib/amigaos.c",
3841
"lib/amigaos.h",
3942
"lib/arpa_telnet.h",
40-
"lib/asyn.h",
4143
"lib/asyn-ares.c",
44+
"lib/asyn.h",
4245
"lib/base64.c",
46+
"lib/config-amigaos.h",
47+
"lib/config-dos.h",
48+
"lib/config-mac.h",
49+
"lib/config-os400.h",
50+
"lib/config-plan9.h",
51+
"lib/config-riscos.h",
52+
"lib/config-tpf.h",
53+
"lib/config-vxworks.h",
4354
"lib/config-win32.h",
55+
"lib/config-win32ce.h",
4456
"lib/conncache.c",
4557
"lib/conncache.h",
4658
"lib/connect.c",
@@ -54,14 +66,20 @@ cc_library(
5466
"lib/curl_base64.h",
5567
"lib/curl_ctype.c",
5668
"lib/curl_ctype.h",
69+
"lib/curl_des.c",
5770
"lib/curl_des.h",
71+
"lib/curl_endian.c",
5872
"lib/curl_endian.h",
5973
"lib/curl_fnmatch.c",
6074
"lib/curl_fnmatch.h",
75+
"lib/curl_get_line.c",
76+
"lib/curl_get_line.h",
6177
"lib/curl_gethostname.c",
6278
"lib/curl_gethostname.h",
79+
"lib/curl_gssapi.c",
6380
"lib/curl_gssapi.h",
6481
"lib/curl_hmac.h",
82+
"lib/curl_krb5.h",
6583
"lib/curl_ldap.h",
6684
"lib/curl_md4.h",
6785
"lib/curl_md5.h",
@@ -70,14 +88,19 @@ cc_library(
7088
"lib/curl_memrchr.h",
7189
"lib/curl_multibyte.c",
7290
"lib/curl_multibyte.h",
91+
"lib/curl_ntlm_core.c",
7392
"lib/curl_ntlm_core.h",
93+
"lib/curl_ntlm_wb.c",
7494
"lib/curl_ntlm_wb.h",
95+
"lib/curl_path.c",
96+
"lib/curl_path.h",
7597
"lib/curl_printf.h",
98+
"lib/curl_range.c",
99+
"lib/curl_range.h",
76100
"lib/curl_rtmp.c",
77101
"lib/curl_rtmp.h",
78102
"lib/curl_sasl.c",
79103
"lib/curl_sasl.h",
80-
"lib/curl_sec.h",
81104
"lib/curl_setup.h",
82105
"lib/curl_setup_once.h",
83106
"lib/curl_sha256.h",
@@ -86,23 +109,35 @@ cc_library(
86109
"lib/curl_threads.c",
87110
"lib/curl_threads.h",
88111
"lib/curlx.h",
112+
"lib/dict.c",
89113
"lib/dict.h",
114+
"lib/doh.c",
115+
"lib/doh.h",
90116
"lib/dotdot.c",
91117
"lib/dotdot.h",
118+
"lib/dynbuf.c",
119+
"lib/dynbuf.h",
92120
"lib/easy.c",
121+
"lib/easygetopt.c",
93122
"lib/easyif.h",
123+
"lib/easyoptions.c",
124+
"lib/easyoptions.h",
94125
"lib/escape.c",
95126
"lib/escape.h",
127+
"lib/file.c",
96128
"lib/file.h",
97129
"lib/fileinfo.c",
98130
"lib/fileinfo.h",
99131
"lib/formdata.c",
100132
"lib/formdata.h",
133+
"lib/ftp.c",
101134
"lib/ftp.h",
135+
"lib/ftplistparser.c",
102136
"lib/ftplistparser.h",
103137
"lib/getenv.c",
104138
"lib/getinfo.c",
105139
"lib/getinfo.h",
140+
"lib/gopher.c",
106141
"lib/gopher.h",
107142
"lib/hash.c",
108143
"lib/hash.h",
@@ -115,6 +150,8 @@ cc_library(
115150
"lib/hostip4.c",
116151
"lib/hostip6.c",
117152
"lib/hostsyn.c",
153+
"lib/hsts.c",
154+
"lib/hsts.h",
118155
"lib/http.c",
119156
"lib/http.h",
120157
"lib/http2.c",
@@ -123,17 +160,21 @@ cc_library(
123160
"lib/http_chunks.h",
124161
"lib/http_digest.c",
125162
"lib/http_digest.h",
163+
"lib/http_negotiate.c",
126164
"lib/http_negotiate.h",
165+
"lib/http_ntlm.c",
127166
"lib/http_ntlm.h",
128167
"lib/http_proxy.c",
129168
"lib/http_proxy.h",
130169
"lib/if2ip.c",
131170
"lib/if2ip.h",
171+
"lib/imap.c",
132172
"lib/imap.h",
133173
"lib/inet_ntop.h",
134174
"lib/inet_pton.c",
135175
"lib/inet_pton.h",
136176
"lib/krb5.c",
177+
"lib/ldap.c",
137178
"lib/llist.c",
138179
"lib/llist.h",
139180
"lib/md4.c",
@@ -143,31 +184,37 @@ cc_library(
143184
"lib/mime.c",
144185
"lib/mime.h",
145186
"lib/mprintf.c",
187+
"lib/mqtt.c",
188+
"lib/mqtt.h",
146189
"lib/multi.c",
147190
"lib/multihandle.h",
148191
"lib/multiif.h",
149192
"lib/netrc.c",
150193
"lib/netrc.h",
194+
"lib/non-ascii.c",
151195
"lib/non-ascii.h",
152196
"lib/nonblock.c",
153197
"lib/nonblock.h",
154198
"lib/nwlib.c",
155199
"lib/nwos.c",
200+
"lib/openldap.c",
156201
"lib/parsedate.c",
157202
"lib/parsedate.h",
158-
"lib/pingpong.h",
159203
"lib/pingpong.c",
204+
"lib/pingpong.h",
205+
"lib/pop3.c",
160206
"lib/pop3.h",
161207
"lib/progress.c",
162208
"lib/progress.h",
209+
"lib/psl.c",
210+
"lib/psl.h",
163211
"lib/quic.h",
164212
"lib/rand.c",
165213
"lib/rand.h",
166-
"lib/rename.h",
167214
"lib/rename.c",
215+
"lib/rename.h",
168216
"lib/rtsp.c",
169217
"lib/rtsp.h",
170-
"lib/security.c",
171218
"lib/select.c",
172219
"lib/select.h",
173220
"lib/sendf.c",
@@ -176,19 +223,24 @@ cc_library(
176223
"lib/setopt.h",
177224
"lib/setup-os400.h",
178225
"lib/setup-vms.h",
226+
"lib/setup-win32.h",
179227
"lib/sha256.c",
180228
"lib/share.c",
181229
"lib/share.h",
182230
"lib/sigpipe.h",
183231
"lib/slist.c",
184232
"lib/slist.h",
233+
"lib/smb.c",
185234
"lib/smb.h",
235+
"lib/smtp.c",
186236
"lib/smtp.h",
187237
"lib/sockaddr.h",
188-
"lib/socketpair.h",
189238
"lib/socketpair.c",
239+
"lib/socketpair.h",
190240
"lib/socks.c",
191241
"lib/socks.h",
242+
"lib/socks_gssapi.c",
243+
"lib/socks_sspi.c",
192244
"lib/speedcheck.c",
193245
"lib/speedcheck.h",
194246
"lib/splay.c",
@@ -204,53 +256,76 @@ cc_library(
204256
"lib/strtoofft.c",
205257
"lib/strtoofft.h",
206258
"lib/system_win32.h",
259+
"lib/telnet.c",
207260
"lib/telnet.h",
261+
"lib/tftp.c",
208262
"lib/tftp.h",
209263
"lib/timeval.c",
210264
"lib/timeval.h",
211265
"lib/transfer.c",
212266
"lib/transfer.h",
213267
"lib/url.c",
214268
"lib/url.h",
269+
"lib/urlapi-int.h",
270+
"lib/urlapi.c",
215271
"lib/urldata.h",
216272
"lib/vauth/cleartext.c",
217273
"lib/vauth/cram.c",
218274
"lib/vauth/digest.c",
219275
"lib/vauth/digest.h",
276+
"lib/vauth/digest_sspi.c",
277+
"lib/vauth/krb5_gssapi.c",
278+
"lib/vauth/krb5_sspi.c",
279+
"lib/vauth/ntlm.c",
220280
"lib/vauth/ntlm.h",
281+
"lib/vauth/ntlm_sspi.c",
221282
"lib/vauth/oauth2.c",
283+
"lib/vauth/spnego_gssapi.c",
284+
"lib/vauth/spnego_sspi.c",
222285
"lib/vauth/vauth.c",
223286
"lib/vauth/vauth.h",
224287
"lib/version.c",
288+
"lib/version_win32.c",
289+
"lib/version_win32.h",
290+
"lib/vquic/ngtcp2.c",
291+
"lib/vquic/ngtcp2.h",
292+
"lib/vquic/quiche.c",
293+
"lib/vquic/quiche.h",
294+
"lib/vquic/vquic.c",
295+
"lib/vquic/vquic.h",
296+
"lib/vssh/libssh.c",
297+
"lib/vssh/libssh2.c",
225298
"lib/vssh/ssh.h",
299+
#"lib/vssh/wolfssh.c",
300+
#"lib/vssh/wolfssh.h",
301+
"lib/vtls/bearssl.c",
226302
"lib/vtls/bearssl.h",
303+
"lib/vtls/gskit.c",
227304
"lib/vtls/gskit.h",
305+
"lib/vtls/gtls.c",
228306
"lib/vtls/gtls.h",
307+
"lib/vtls/keylog.c",
308+
"lib/vtls/keylog.h",
309+
"lib/vtls/mbedtls.c",
229310
"lib/vtls/mbedtls.h",
311+
"lib/vtls/mbedtls_threadlock.c",
312+
"lib/vtls/mbedtls_threadlock.h",
313+
"lib/vtls/mesalink.c",
314+
"lib/vtls/mesalink.h",
315+
"lib/vtls/nss.c",
230316
"lib/vtls/nssg.h",
231317
"lib/vtls/openssl.h",
232318
"lib/vtls/schannel.h",
319+
"lib/vtls/sectransp.h",
233320
"lib/vtls/vtls.c",
234321
"lib/vtls/vtls.h",
322+
"lib/vtls/wolfssl.c",
235323
"lib/vtls/wolfssl.h",
236324
"lib/warnless.c",
237325
"lib/warnless.h",
238326
"lib/wildcard.c",
239327
"lib/wildcard.h",
240328
"lib/x509asn1.h",
241-
"lib/psl.h",
242-
"lib/psl.c",
243-
"lib/vtls/sectransp.h",
244-
"lib/vtls/mesalink.h",
245-
"lib/vtls/mesalink.c",
246-
"lib/curl_get_line.h",
247-
"lib/curl_get_line.c",
248-
"lib/urlapi-int.h",
249-
"lib/urlapi.c",
250-
"lib/altsvc.h",
251-
"lib/altsvc.c",
252-
"lib/doh.h",
253-
"lib/doh.c",
254329
] + select({
255330
"@org_tensorflow//tensorflow:macos": [
256331
"lib/vtls/sectransp.c",

0 commit comments

Comments
 (0)