mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-07-28 04:59:58 +00:00
TUN-1615: revert miekg/dns to last known working revision
The last known good commit is 6da3249dfb57fbaa16efafcd8744cee8809d80cd before the first release tag.
This commit is contained in:
20
vendor/github.com/miekg/dns/scan_rr.go
generated
vendored
20
vendor/github.com/miekg/dns/scan_rr.go
generated
vendored
@@ -1255,10 +1255,8 @@ func setNSEC3(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
|
||||
if len(l.token) == 0 || l.err {
|
||||
return nil, &ParseError{f, "bad NSEC3 Salt", l}, ""
|
||||
}
|
||||
if l.token != "-" {
|
||||
rr.SaltLength = uint8(len(l.token)) / 2
|
||||
rr.Salt = l.token
|
||||
}
|
||||
rr.SaltLength = uint8(len(l.token)) / 2
|
||||
rr.Salt = l.token
|
||||
|
||||
<-c
|
||||
l = <-c
|
||||
@@ -1323,10 +1321,8 @@ func setNSEC3PARAM(h RR_Header, c chan lex, o, f string) (RR, *ParseError, strin
|
||||
rr.Iterations = uint16(i)
|
||||
<-c
|
||||
l = <-c
|
||||
if l.token != "-" {
|
||||
rr.SaltLength = uint8(len(l.token))
|
||||
rr.Salt = l.token
|
||||
}
|
||||
rr.SaltLength = uint8(len(l.token))
|
||||
rr.Salt = l.token
|
||||
return rr, nil, ""
|
||||
}
|
||||
|
||||
@@ -2099,7 +2095,7 @@ func setTKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
|
||||
return nil, &ParseError{f, "bad TKEY algorithm", l}, ""
|
||||
}
|
||||
rr.Algorithm = l.token
|
||||
<-c // zBlank
|
||||
<-c // zBlank
|
||||
|
||||
// Get the key length and key values
|
||||
l = <-c
|
||||
@@ -2108,13 +2104,13 @@ func setTKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
|
||||
return nil, &ParseError{f, "bad TKEY key length", l}, ""
|
||||
}
|
||||
rr.KeySize = uint16(i)
|
||||
<-c // zBlank
|
||||
<-c // zBlank
|
||||
l = <-c
|
||||
if l.value != zString {
|
||||
return nil, &ParseError{f, "bad TKEY key", l}, ""
|
||||
}
|
||||
rr.Key = l.token
|
||||
<-c // zBlank
|
||||
<-c // zBlank
|
||||
|
||||
// Get the otherdata length and string data
|
||||
l = <-c
|
||||
@@ -2123,7 +2119,7 @@ func setTKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
|
||||
return nil, &ParseError{f, "bad TKEY otherdata length", l}, ""
|
||||
}
|
||||
rr.OtherLen = uint16(i)
|
||||
<-c // zBlank
|
||||
<-c // zBlank
|
||||
l = <-c
|
||||
if l.value != zString {
|
||||
return nil, &ParseError{f, "bad TKEY otherday", l}, ""
|
||||
|
Reference in New Issue
Block a user