Merge with scapy-win2 branch

scapy/asn1/asn1.py

@@ -20,6 +20,9 @@ class RandASN1Object(RandField):
         o = random.choice(self.objlist)
         if issubclass(o, ASN1_INTEGER):
             return o(int(random.gauss(0,1000)))
+        elif issubclass(o, ASN1_IPADDRESS):
+            z = RandIP()._fix()
+            return o(z)
         elif issubclass(o, ASN1_STRING):
             z = int(random.expovariate(0.05)+1)
             return o("".join([random.choice(self.chars) for i in range(z)]))

scapy/asn1/ber.py

@@ -233,7 +233,7 @@ class BERcodec_NULL(BERcodec_INTEGER):
         if i == 0:
             return chr(cls.tag)+"\0"
         else:
-            return super(cls,cls).enc(i)
+            return BERcodec_INTEGER.enc(i)
 
 class BERcodec_SEP(BERcodec_NULL):
     tag = ASN1_Class_UNIVERSAL.SEP
@@ -260,6 +260,12 @@ class BERcodec_T61_STRING (BERcodec_STRING):
 class BERcodec_IA5_STRING(BERcodec_STRING):
     tag = ASN1_Class_UNIVERSAL.IA5_STRING
 
+class BERcodec_NUMERIC_STRING(BERcodec_STRING):
+    tag = ASN1_Class_UNIVERSAL.NUMERIC_STRING
+
+class BERcodec_VIDEOTEX_STRING(BERcodec_STRING):
+    tag = ASN1_Class_UNIVERSAL.VIDEOTEX_STRING
+
 class BERcodec_IPADDRESS(BERcodec_STRING):
     tag = ASN1_Class_UNIVERSAL.IPADDRESS