fix up the rest

dns.go

@@ -93,6 +93,9 @@ func (h *RR_Header) String() string {
 
 // Or expose the pack/unpack functions??
 
+// These were created for dnssec.go, but now that
+// this package is included again in dns, they are
+// not really needed
 // Return the wiredata of rdata portion of a RR.
 func WireRdata(r RR) ([]byte, bool) {
 	buf := make([]byte, 4096) // Too large, need to FIX TODO(mg)

resolver/resolverTsig_test.go

@@ -28,7 +28,7 @@ func TestResolverTsig(t *testing.T) {
         tsig.Hdr.Rrtype = dns.TypeTSIG
         tsig.Hdr.Class = dns.ClassANY
         tsig.Hdr.Ttl = 0
-        tsig.GenerateMAC(m, "geheim")
+        tsig.Generate(m, "geheim")
         // Add it to the msg
         m.Extra[0] = tsig