diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
| commit | 4c683aff7627040ff811f065848a820b2cb19d59 (patch) | |
| tree | 668061e8acfd8827fd02bab18a998b7986944296 /vendor/github.com/miekg/dns/scan_rr.go | |
| parent | eb78d273f39202046fa71555a5a19b0ec8a95cb3 (diff) | |
| parent | 1af1bce6199597bb2d41ddcdc00ef0f28a73c83e (diff) | |
| download | chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.gz chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.bz2 chat-4c683aff7627040ff811f065848a820b2cb19d59.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'vendor/github.com/miekg/dns/scan_rr.go')
| -rw-r--r-- | vendor/github.com/miekg/dns/scan_rr.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vendor/github.com/miekg/dns/scan_rr.go b/vendor/github.com/miekg/dns/scan_rr.go index f4ccc8424..fb6f95d1d 100644 --- a/vendor/github.com/miekg/dns/scan_rr.go +++ b/vendor/github.com/miekg/dns/scan_rr.go @@ -1255,8 +1255,10 @@ 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}, "" } - rr.SaltLength = uint8(len(l.token)) / 2 - rr.Salt = l.token + if l.token != "-" { + rr.SaltLength = uint8(len(l.token)) / 2 + rr.Salt = l.token + } <-c l = <-c @@ -1321,8 +1323,10 @@ func setNSEC3PARAM(h RR_Header, c chan lex, o, f string) (RR, *ParseError, strin rr.Iterations = uint16(i) <-c l = <-c - rr.SaltLength = uint8(len(l.token)) - rr.Salt = l.token + if l.token != "-" { + rr.SaltLength = uint8(len(l.token)) + rr.Salt = l.token + } return rr, nil, "" } |