mirrors/dns
1
0
Fork 0
mirror of https://github.com/miekg/dns.git synced 2025-10-11 18:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

More tsig stuff

Browse Source
This commit is contained in:
Miek Gieben 2011-03-14 22:05:57 +01:00
parent 472cc11a89
commit 566b5f7d1a
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resolver.go
View File

@ -285,7 +285,7 @@ Server:
if t.(*RR_TSIG).Verify(in, secret, reqmac) { if t.(*RR_TSIG).Verify(in, secret, reqmac) {
println("Validates") println("Validates")
} else { } else {
println("DOES NOT validates") println("DOES NOT validate")
} }
} }
} }

35
tsig.go
View File

@ -123,6 +123,7 @@ func (t *RR_TSIG) Verify(m *Msg, secret, reqmac string) bool {
} }
println(msg2.String()) println(msg2.String())
msg2.MsgHdr.Id = t.OrigId msg2.MsgHdr.Id = t.OrigId
println(msg2.String())
msg2.Extra = msg2.Extra[:len(msg2.Extra)-1] // Strip off the TSIG msg2.Extra = msg2.Extra[:len(msg2.Extra)-1] // Strip off the TSIG
buf, ok := tsigToBuf(t, msg2, reqmac) buf, ok := tsigToBuf(t, msg2, reqmac)
if !ok { if !ok {
@ -134,18 +135,31 @@ func (t *RR_TSIG) Verify(m *Msg, secret, reqmac string) bool {
println("t.MAC", strings.ToUpper(t.MAC)) println("t.MAC", strings.ToUpper(t.MAC))
println("our MAC", strings.ToUpper(hex.EncodeToString(h.Sum()))) println("our MAC", strings.ToUpper(hex.EncodeToString(h.Sum())))
println("req mac", reqmac) println("req mac", reqmac)
return strings.ToUpper(hex.EncodeToString(h.Sum())) == strings.ToUpper(t.MAC) return strings.ToUpper(hex.EncodeToString(h.Sum())) == strings.ToUpper(reqmac)
} }
func tsigToBuf(rr *RR_TSIG, msg *Msg, reqmac string) ([]byte, bool) { func tsigToBuf(rr *RR_TSIG, msg *Msg, reqmac string) ([]byte, bool) {
var mb []byte var mb []byte
var buf []byte var buf []byte
if reqmac != "" {
m := new(macWireFmt)
m.MACSize = uint16(len(reqmac) / 2)
m.MAC = reqmac
mb = make([]byte, len(reqmac)) // reqmac should be twice as long
n, ok := packStruct(m, mb, 0)
if !ok {
return nil, false
}
mb = mb[:n]
}
tsigvar := make([]byte, DefaultMsgSize) tsigvar := make([]byte, DefaultMsgSize)
tsig := new(tsigWireFmt) tsig := new(tsigWireFmt)
tsig.Name = rr.Header().Name tsig.Name = strings.ToLower(rr.Header().Name)
tsig.Class = rr.Header().Class tsig.Class = rr.Header().Class
tsig.Ttl = rr.Header().Ttl tsig.Ttl = rr.Header().Ttl
tsig.Algorithm = rr.Algorithm tsig.Algorithm = strings.ToLower(rr.Algorithm)
tsig.TimeSigned = rr.TimeSigned tsig.TimeSigned = rr.TimeSigned
tsig.Fudge = rr.Fudge tsig.Fudge = rr.Fudge
tsig.Error = rr.Error tsig.Error = rr.Error
@ -161,21 +175,10 @@ func tsigToBuf(rr *RR_TSIG, msg *Msg, reqmac string) ([]byte, bool) {
return nil, false return nil, false
} }
if reqmac != "" { if reqmac != "" {
m := new(macWireFmt)
m.MAC = reqmac
m.MACSize = uint16(len(reqmac) / 2)
mb = make([]byte, len(reqmac)) // reqmac should be twice as long
n, ok := packStruct(m, mb, 0)
if !ok {
return nil, false
}
mb = mb[:n]
}
if mb == nil {
buf = append(msgbuf, tsigvar...)
} else {
x := append(mb, msgbuf...) x := append(mb, msgbuf...)
buf = append(x, tsigvar...) buf = append(x, tsigvar...)
} else {
buf = append(msgbuf, tsigvar...)
} }
return buf, true return buf, true
} }