diff options
| author | Russ Cox <rsc@golang.org> | 2020-07-06 23:46:17 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-07-07 16:14:42 +0000 |
| commit | 18d042e08e46f9d9b55d7347f2dac28277060ef9 (patch) | |
| tree | 73268be7341c689bc8908318f46ecba93fabe81d /src/vendor | |
| parent | bff372793a6bb685b6338eb84ddb5583d57c7f9c (diff) | |
| download | go-18d042e08e46f9d9b55d7347f2dac28277060ef9.tar.gz go-18d042e08e46f9d9b55d7347f2dac28277060ef9.zip | |
all: go get golang.org/x/net@ab3426394381
Pull in dns/dnsmessage fix to drop fmt dependency.
Also pulled in minor bug fix in x/crypto (dep of net).
Change-Id: I0f618e81a24ac24a5adae00af34b728b243dfdbb
Reviewed-on: https://go-review.googlesource.com/c/go/+/241257
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'src/vendor')
| -rw-r--r-- | src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | 4 | ||||
| -rw-r--r-- | src/vendor/golang.org/x/net/dns/dnsmessage/message.go | 3 | ||||
| -rw-r--r-- | src/vendor/modules.txt | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go b/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go index b26376aeca..d3596ee66f 100644 --- a/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go +++ b/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go @@ -230,12 +230,12 @@ func (b *Builder) AddASN1(tag asn1.Tag, f BuilderContinuation) { // String -// ReadASN1Boolean decodes an ASN.1 INTEGER and converts it to a boolean +// ReadASN1Boolean decodes an ASN.1 BOOLEAN and converts it to a boolean // representation into out and advances. It reports whether the read // was successful. func (s *String) ReadASN1Boolean(out *bool) bool { var bytes String - if !s.ReadASN1(&bytes, asn1.INTEGER) || len(bytes) != 1 { + if !s.ReadASN1(&bytes, asn1.BOOLEAN) || len(bytes) != 1 { return false } 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 da8bafd921..654f191f8a 100644 --- a/src/vendor/golang.org/x/net/dns/dnsmessage/message.go +++ b/src/vendor/golang.org/x/net/dns/dnsmessage/message.go @@ -14,7 +14,6 @@ package dnsmessage import ( "errors" - "fmt" ) // Message formats @@ -2141,7 +2140,7 @@ func unpackResourceBody(msg []byte, off int, hdr ResourceHeader) (ResourceBody, return nil, off, &nestedError{name + " record", err} } if r == nil { - return nil, off, fmt.Errorf("invalid resource type: %d", hdr.Type) + return nil, off, errors.New("invalid resource type: " + hdr.Type.String()) } return r, off + int(hdr.Length), nil } diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index 7c42df8348..e687d77b4d 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,4 +1,4 @@ -# golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 +# golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 ## explicit golang.org/x/crypto/chacha20 golang.org/x/crypto/chacha20poly1305 @@ -8,7 +8,7 @@ golang.org/x/crypto/curve25519 golang.org/x/crypto/hkdf golang.org/x/crypto/internal/subtle golang.org/x/crypto/poly1305 -# golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 +# golang.org/x/net v0.0.0-20200707034311-ab3426394381 ## explicit golang.org/x/net/dns/dnsmessage golang.org/x/net/http/httpguts |