aboutsummaryrefslogtreecommitdiff
path: root/src/vendor
diff options
context:
space:
mode:
authorDamien Neil <dneil@google.com>2022-09-06 09:58:29 -0700
committerGopher Robot <gobot@golang.org>2022-09-06 23:07:55 +0000
commit29af494fca8a25d7d46276f6d4835c4dcd09e47d (patch)
treecb7b1d9fc31b8c5e9324067170562aa954ff6d9f /src/vendor
parentc83e1b6d5bd5378689a6485775a9a4f80c9c66ed (diff)
downloadgo-29af494fca8a25d7d46276f6d4835c4dcd09e47d.tar.gz
go-29af494fca8a25d7d46276f6d4835c4dcd09e47d.zip
all: update vendored golang.org/x/net
Pull in security fix: f3363e06e7 http2: handle server errors after sending GOAWAY Fixes CVE-2022-27664 Fixes golang/go#54658 Change-Id: Ie1f58a8d769c7fd75c67d202c611a3abfd7dbb35 Reviewed-on: https://go-review.googlesource.com/c/go/+/428717 TryBot-Result: Gopher Robot <gobot@golang.org> Run-TryBot: Damien Neil <dneil@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Auto-Submit: Damien Neil <dneil@google.com>
Diffstat (limited to 'src/vendor')
-rw-r--r--src/vendor/golang.org/x/net/dns/dnsmessage/message.go12
-rw-r--r--src/vendor/golang.org/x/net/nettest/nettest.go6
-rw-r--r--src/vendor/golang.org/x/net/route/zsys_freebsd_riscv64.go52
-rw-r--r--src/vendor/modules.txt2
4 files changed, 70 insertions, 2 deletions
diff --git a/src/vendor/golang.org/x/net/dns/dnsmessage/message.go b/src/vendor/golang.org/x/net/dns/dnsmessage/message.go
index 0cdf89f9ff..0935878292 100644
--- a/src/vendor/golang.org/x/net/dns/dnsmessage/message.go
+++ b/src/vendor/golang.org/x/net/dns/dnsmessage/message.go
@@ -317,6 +317,8 @@ type Header struct {
Truncated bool
RecursionDesired bool
RecursionAvailable bool
+ AuthenticData bool
+ CheckingDisabled bool
RCode RCode
}
@@ -338,6 +340,12 @@ func (m *Header) pack() (id uint16, bits uint16) {
if m.Response {
bits |= headerBitQR
}
+ if m.AuthenticData {
+ bits |= headerBitAD
+ }
+ if m.CheckingDisabled {
+ bits |= headerBitCD
+ }
return
}
@@ -379,6 +387,8 @@ const (
headerBitTC = 1 << 9 // truncated
headerBitRD = 1 << 8 // recursion desired
headerBitRA = 1 << 7 // recursion available
+ headerBitAD = 1 << 5 // authentic data
+ headerBitCD = 1 << 4 // checking disabled
)
var sectionNames = map[section]string{
@@ -456,6 +466,8 @@ func (h *header) header() Header {
Truncated: (h.bits & headerBitTC) != 0,
RecursionDesired: (h.bits & headerBitRD) != 0,
RecursionAvailable: (h.bits & headerBitRA) != 0,
+ AuthenticData: (h.bits & headerBitAD) != 0,
+ CheckingDisabled: (h.bits & headerBitCD) != 0,
RCode: RCode(h.bits & 0xF),
}
}
diff --git a/src/vendor/golang.org/x/net/nettest/nettest.go b/src/vendor/golang.org/x/net/nettest/nettest.go
index ae5413b23d..6918f2c362 100644
--- a/src/vendor/golang.org/x/net/nettest/nettest.go
+++ b/src/vendor/golang.org/x/net/nettest/nettest.go
@@ -218,7 +218,11 @@ func NewLocalPacketListener(network string) (net.PacketConn, error) {
// LocalPath returns a local path that can be used for Unix-domain
// protocol testing.
func LocalPath() (string, error) {
- f, err := ioutil.TempFile("", "go-nettest")
+ dir := ""
+ if runtime.GOOS == "darwin" {
+ dir = "/tmp"
+ }
+ f, err := ioutil.TempFile(dir, "go-nettest")
if err != nil {
return "", err
}
diff --git a/src/vendor/golang.org/x/net/route/zsys_freebsd_riscv64.go b/src/vendor/golang.org/x/net/route/zsys_freebsd_riscv64.go
new file mode 100644
index 0000000000..9293393698
--- /dev/null
+++ b/src/vendor/golang.org/x/net/route/zsys_freebsd_riscv64.go
@@ -0,0 +1,52 @@
+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
+// cgo -godefs defs_freebsd.go
+
+package route
+
+const (
+ sizeofIfMsghdrlFreeBSD10 = 0xb0
+ sizeofIfaMsghdrFreeBSD10 = 0x14
+ sizeofIfaMsghdrlFreeBSD10 = 0xb0
+ sizeofIfmaMsghdrFreeBSD10 = 0x10
+ sizeofIfAnnouncemsghdrFreeBSD10 = 0x18
+
+ sizeofRtMsghdrFreeBSD10 = 0x98
+ sizeofRtMetricsFreeBSD10 = 0x70
+
+ sizeofIfMsghdrFreeBSD7 = 0xa8
+ sizeofIfMsghdrFreeBSD8 = 0xa8
+ sizeofIfMsghdrFreeBSD9 = 0xa8
+ sizeofIfMsghdrFreeBSD10 = 0xa8
+ sizeofIfMsghdrFreeBSD11 = 0xa8
+
+ sizeofIfDataFreeBSD7 = 0x98
+ sizeofIfDataFreeBSD8 = 0x98
+ sizeofIfDataFreeBSD9 = 0x98
+ sizeofIfDataFreeBSD10 = 0x98
+ sizeofIfDataFreeBSD11 = 0x98
+
+ sizeofIfMsghdrlFreeBSD10Emu = 0xb0
+ sizeofIfaMsghdrFreeBSD10Emu = 0x14
+ sizeofIfaMsghdrlFreeBSD10Emu = 0xb0
+ sizeofIfmaMsghdrFreeBSD10Emu = 0x10
+ sizeofIfAnnouncemsghdrFreeBSD10Emu = 0x18
+
+ sizeofRtMsghdrFreeBSD10Emu = 0x98
+ sizeofRtMetricsFreeBSD10Emu = 0x70
+
+ sizeofIfMsghdrFreeBSD7Emu = 0xa8
+ sizeofIfMsghdrFreeBSD8Emu = 0xa8
+ sizeofIfMsghdrFreeBSD9Emu = 0xa8
+ sizeofIfMsghdrFreeBSD10Emu = 0xa8
+ sizeofIfMsghdrFreeBSD11Emu = 0xa8
+
+ sizeofIfDataFreeBSD7Emu = 0x98
+ sizeofIfDataFreeBSD8Emu = 0x98
+ sizeofIfDataFreeBSD9Emu = 0x98
+ sizeofIfDataFreeBSD10Emu = 0x98
+ sizeofIfDataFreeBSD11Emu = 0x98
+
+ sizeofSockaddrStorage = 0x80
+ sizeofSockaddrInet = 0x10
+ sizeofSockaddrInet6 = 0x1c
+)
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 60c53b2dcd..a821f21f33 100644
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -7,7 +7,7 @@ golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/hkdf
golang.org/x/crypto/internal/poly1305
golang.org/x/crypto/internal/subtle
-# golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48
+# golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
## explicit; go 1.17
golang.org/x/net/dns/dnsmessage
golang.org/x/net/http/httpguts