Minor fixes

Author: gpotter2

scapy/contrib/send.py

@@ -26,7 +26,7 @@
 
 from scapy.packet import *
 from scapy.fields import *
-from scapy.layers.x509 import ASN1F_X509_SubjectPublicKeyInfoRSA
+from scapy.layers.x509 import X509_SubjectPublicKeyInfo
 from scapy.layers.inet6 import icmp6ndoptscls, _ICMPv6NDGuessPayload
 
 class ICMPv6NDOptNonce(_ICMPv6NDGuessPayload, Packet):

scapy/utils.py

@@ -852,12 +852,7 @@ def read_all(self,count=-1):
         res=[]
         while count != 0:
             count -= 1
-            try:
-                p = self.read_packet()
-            except:
-                if conf.debug_dissector:
-                    warning("read_packet failed on packet %s", len(res))
-                raise
+            p = self.read_packet()
             if p is None:
                 break
             res.append(p)

scapy/volatile.py

@@ -279,9 +279,9 @@ def _fix(self):
     def __mul__(self, n):
         return self._fix()*n
 
-class RandBin(RandString):
+class RandBin(RandString, object):
     def __init__(self, size=None):
-        RandString.__init__(self, size, b"".join(map(chb, range(256))))
+        super(RandBin, self).__init__(size=size, chars=b"".join(chb(c) for c in range(256)))
     def _fix(self):
         s = b""
         for _ in range(self.size):