Skip to content

Commit 31d06b5

Browse files
neilddmitshur
authored andcommitted
[release-branch.go1.18] all: upgrade golang.org/x/net to v0.0.0-20220907013725-0a43f88f7ef0
Restore vendoring after go1.18.6 security release. For #53977 Change-Id: Ifff04582aa3d5fce40606265db42af3415c3c0b4 Reviewed-on: https://go-review.googlesource.com/c/go/+/429316 Reviewed-by: Carlos Amedee <[email protected]> Run-TryBot: Damien Neil <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 170d78d commit 31d06b5

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

src/cmd/internal/moddeps/moddeps_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ import (
3434
// See issues 36852, 41409, and 43687.
3535
// (Also see golang.org/issue/27348.)
3636
func TestAllDependencies(t *testing.T) {
37-
t.Skip("TODO(#53977): 1.18.5 contains unreleased changes from vendored modules")
38-
3937
goBin := testenv.GoToolPath(t)
4038

4139
// Ensure that all packages imported within GOROOT

src/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
7-
golang.org/x/net v0.0.0-20211209124913-491a49abca63
7+
golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0
88
)
99

1010
require (

src/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
22
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
3-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
4-
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
3+
golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0 h1:XXaSUSplyi6wsRNJGB7vUBvDjbxc8UPYBsf9ukBQ3KA=
4+
golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
55
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
66
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77
golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2 h1:GLw7MR8AfAG2GmGcmVgObFOHXYypgGjnGno25RDwn3Y=

src/net/http/h2_bundle.go

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

src/vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ golang.org/x/crypto/curve25519/internal/field
99
golang.org/x/crypto/hkdf
1010
golang.org/x/crypto/internal/poly1305
1111
golang.org/x/crypto/internal/subtle
12-
# golang.org/x/net v0.0.0-20211209124913-491a49abca63
12+
# golang.org/x/net v0.0.0-20220907013725-0a43f88f7ef0
1313
## explicit; go 1.17
1414
golang.org/x/net/dns/dnsmessage
1515
golang.org/x/net/http/httpguts

0 commit comments

Comments
 (0)