Skip to content

Commit 5245d86

Browse files
authored
Merge pull request #6551 from tonistiigi/v0.28-cherry-picks
[v0.28] cherry picks
2 parents ecde336 + 90ee5de commit 5245d86

6 files changed

Lines changed: 21 additions & 13 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ require (
104104
golang.org/x/crypto v0.48.0
105105
golang.org/x/exp v0.0.0-20250911091902-df9299821621
106106
golang.org/x/mod v0.33.0
107-
golang.org/x/net v0.50.0
107+
golang.org/x/net v0.51.0
108108
golang.org/x/sync v0.19.0
109109
golang.org/x/sys v0.41.0
110110
golang.org/x/time v0.14.0
@@ -139,7 +139,7 @@ require (
139139
github.com/beorn7/perks v1.0.1 // indirect
140140
github.com/blang/semver v3.5.1+incompatible // indirect
141141
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
142-
github.com/cloudflare/circl v1.6.1 // indirect
142+
github.com/cloudflare/circl v1.6.3 // indirect
143143
github.com/containerd/cgroups/v3 v3.1.2 // indirect
144144
github.com/containerd/errdefs/pkg v0.3.0 // indirect
145145
github.com/containerd/fifo v1.1.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
126126
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
127127
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
128128
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
129-
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
130-
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
129+
github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
130+
github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
131131
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
132132
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
133133
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
@@ -721,8 +721,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
721721
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
722722
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
723723
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
724-
golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
725-
golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
724+
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
725+
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
726726
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
727727
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
728728
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=

vendor/github.com/cloudflare/circl/internal/sha3/xor_unaligned.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudflare/circl/sign/sign.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/net/http2/frame.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ github.com/cenkalti/backoff/v5
305305
# github.com/cespare/xxhash/v2 v2.3.0
306306
## explicit; go 1.11
307307
github.com/cespare/xxhash/v2
308-
# github.com/cloudflare/circl v1.6.1
308+
# github.com/cloudflare/circl v1.6.3
309309
## explicit; go 1.22.0
310310
github.com/cloudflare/circl/dh/x25519
311311
github.com/cloudflare/circl/dh/x448
@@ -1261,8 +1261,8 @@ golang.org/x/exp/trace/internal/version
12611261
## explicit; go 1.24.0
12621262
golang.org/x/mod/semver
12631263
golang.org/x/mod/sumdb/note
1264-
# golang.org/x/net v0.50.0
1265-
## explicit; go 1.24.0
1264+
# golang.org/x/net v0.51.0
1265+
## explicit; go 1.25.0
12661266
golang.org/x/net/http/httpguts
12671267
golang.org/x/net/http2
12681268
golang.org/x/net/http2/hpack

0 commit comments

Comments
 (0)