pNet-DNS 0.0.4 → 1.0.0

data/lib/Net/DNS/Packet.rb

@@ -542,7 +542,7 @@ module Net
         compname="";
         names=Net::DNS::name2labels(name);
         
-        if ((names.length == 1 && names[0]=""))
+        if ((names.length == 1 && names[0]==""))
           names=[]
         else
           while (!names.empty?)
@@ -595,19 +595,10 @@ module Net
       end
       
       def Packet.dn_expand_PP(packet, offset)
-        #	my ($packet, $offset) = @_; # $seen from $_[2] for debugging
         name = "";
         packetlen = packet.length;
         int16sz = Net::DNS::INT16SZ;
         
-        # Debugging
-        # warn "USING PURE PERL dn_expand()\n";
-        #if ($seen->{$offset}) {
-        #	die "dn_expand: loop: offset=$offset (seen = ",
-        #	     join(",", keys %$seen), ")\n";
-        #}
-        #$seen->{$offset} = 1;
-        
         while (true)
           return nil, nil if packetlen < (offset + 1);
           
@@ -688,7 +679,7 @@ module Net
         else
           key_name, key = args;
           if ((key_name!=nil) && (key!=nil))
-            tsig = Net::DNS::RR.new("#{key_name} TSIG #{key}")
+            tsig = Net::DNS::RR.new_from_string("#{key_name} TSIG #{key}")
           end
         end
         

data/lib/Net/DNS/RR/OPT.rb

@@ -132,7 +132,7 @@ module Net
             @optiondata   = data[offset+4, @optionlength].unpack("n");
           end
           
-          @_rcode_flags  = [ttl].pack("N");
+          @_rcode_flags  = [@ttl].pack("N");
           
           @extendedrcode = @_rcode_flags[0, 1].unpack("C")[0];
           @ednsversion   = @_rcode_flags[1, 1].unpack("C")[0];

data/lib/Net/DNS/RR/TSIG.rb

@@ -218,7 +218,7 @@ module Net
         
         def init_defaults
           @algorithm   = DEFAULT_ALGORITHM
-          @time_signed = Time.now
+          @time_signed = Time.now.to_i
           @fudge       = DEFAULT_FUDGE
           @mac_size    = 0
           @mac         = ""
@@ -232,7 +232,8 @@ module Net
             key.gsub!(/ /,"")
             key = Base64::decode64(key)
             
-            OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new("md5"), key, data) 
+#            OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new("md5"), key, data) 
+            OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("md5"), key, data) 
             
             #            hmac = Digest::HMAC_MD5.new(key)
             #            hmac.add(data)
@@ -241,7 +242,7 @@ module Net
           }
           
           # RFC 2845 Section 2.3
-          rrclass = "ANY"
+          @rrclass = "ANY"
         end
         
         def error
@@ -291,7 +292,7 @@ module Net
         def sig_data(packet)
           # return the data that needs to be signed/verified. This is useful for
           # external TSIG verification routines
-          newpacket = Packet.new
+          newpacket = packet.clone
           sigdata = ""
           
           newpacket.additional = []

data/test/tc_escapedchars.rb

@@ -170,7 +170,7 @@ class TestEscapedChars < Test::Unit::TestCase
     
     [ # all non \w characters :-) 
 	  '\000\001\002\003\004\005\006\007\008\009\010\011\012\013\014\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029\030\031\032.\033\034\035\036\037\038\039\040\041\042\043\044\045\046\047\048.\058\059\060\061\062\063\064\065.\091\092\093\094\095\096.\123\124\125\126\127\128\129',
-	  '\000\001\002\003\004\005\006\007\008\009\010\011\012\013\014\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029\030\031\032.!\"#\$%&\'\(\)*+,-\./0.:\<=>?\@A.[\\\\]^_`.{|}~\127\128\129',
+	  '\000\001\002\003\004\005\006\007\008\009\010\011\012\013\014\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029\030\031\032.!\"#\$%&\'\(\)*+,-\./0.:\;<=>?\@A.[\\\\]^_`.{|}~\127\128\129',
     5,
     [33,16,8,6,7],
 	  "21000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20102122232425262728292a2b2c2d2e2f30083a3b3c3d3e3f4041065b5c5d5e5f60077b7c7d7e7f808100",
@@ -218,8 +218,8 @@ class TestEscapedChars < Test::Unit::TestCase
       
       # @todo Net::DNS does not yet have this functionality
       #~ Net::DNS::HAVE_XS=0
-      #~ name,offset=dn_expand(wire,0)    
-      #~ assert_equal(name,testinput[1],"DN_EXPAND (pp) consistent")
+      name,offset=Net::DNS::Packet.dn_expand(wire,0)    
+      assert_equal(name.to_s,testinput[1].to_s,"DN_EXPAND (pp) consistent")
       #~ Net::DNS::HAVE_XS=had_xs
     end
     

data/test/tc_tkey.rb

@@ -91,7 +91,7 @@ class TestTKey < Test::Unit::TestCase
    #         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new("md5"), key, data) 
         hmac = Digest::MD5.new(key)
         hmac.update(data)
-        return hmac.hexdigest
+        return hmac.digest
         },
     :other_len   => 0,
     :other_data  => nil,

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: pNet-DNS
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2006-12-19 00:00:00 +00:00
+  version: 1.0.0
+date: 2007-05-29 00:00:00 +01:00
 summary: Ruby port of perl Net::DNS
 require_paths: 
 - lib
 email: alexd@nominet.org.uk
-homepage: "@todo@"
+homepage: http://rubyforge.org/projects/pnet-dns/
 rubyforge_project: 
 description: 
 autorequire: Net/DNS