Minor PEP8 fixes

Author: gpotter2

scapy/asn1/asn1.py

@@ -93,7 +93,7 @@ def _fix(self, n=0):
             return o(GeneralizedTime()._fix())
         elif issubclass(o, ASN1_STRING):
             z1 = int(random.expovariate(0.05) + 1)
-            return o("".join(random.choice(self.chars) for _ in range(z1)))
+            return o("".join(random.choice(self.chars) for _ in range(z1)).encode())
         elif issubclass(o, ASN1_SEQUENCE) and (n < 10):
             z2 = int(random.expovariate(0.08) + 1)
             return o([self.__class__(objlist=self.objlist)._fix(n + 1)
@@ -520,7 +520,7 @@ def __repr__(self):
         )
 
 
-class ASN1_STRING(ASN1_Object[str]):
+class ASN1_STRING(ASN1_Object[bytes]):
     tag = ASN1_Class_UNIVERSAL.STRING
 
 
@@ -555,11 +555,11 @@ class ASN1_UTF8_STRING(ASN1_STRING):
     tag = ASN1_Class_UNIVERSAL.UTF8_STRING
 
 
-class ASN1_NUMERIC_STRING(ASN1_STRING):
+class ASN1_NUMERIC_STRING(ASN1_Object[str]):
     tag = ASN1_Class_UNIVERSAL.NUMERIC_STRING
 
 
-class ASN1_PRINTABLE_STRING(ASN1_STRING):
+class ASN1_PRINTABLE_STRING(ASN1_Object[str]):
     tag = ASN1_Class_UNIVERSAL.PRINTABLE_STRING
 
 
@@ -579,7 +579,7 @@ class ASN1_GENERAL_STRING(ASN1_STRING):
     tag = ASN1_Class_UNIVERSAL.GENERAL_STRING
 
 
-class ASN1_GENERALIZED_TIME(ASN1_STRING):
+class ASN1_GENERALIZED_TIME(ASN1_Object[str]):
     """
     Improved version of ASN1_GENERALIZED_TIME, properly handling time zones and
     all string representation formats defined by ASN.1. These are:
@@ -723,7 +723,7 @@ def __repr__(self):
         # type: () -> str
         return "<%s[%r]>" % (
             self.__dict__.get("name", self.__class__.__name__),
-            self.val.decode("utf-16be"),  # type: ignore
+            self.val.decode("utf-16be"),
         )
 
 
@@ -742,7 +742,7 @@ class ASN1_SET(ASN1_SEQUENCE):
     tag = ASN1_Class_UNIVERSAL.SET
 
 
-class ASN1_IPADDRESS(ASN1_STRING):
+class ASN1_IPADDRESS(ASN1_Object[str]):
     tag = ASN1_Class_UNIVERSAL.IPADDRESS
 
 

scapy/asn1fields.py

@@ -981,7 +981,7 @@ class ASN1F_STRING_PacketField(ASN1F_STRING):
     def i2m(self, pkt, val):
         # type: (ASN1_Packet, Any) -> bytes
         if hasattr(val, "ASN1_root"):
-            val = ASN1_STRING(bytes(val))  # type: ignore
+            val = ASN1_STRING(bytes(val))
         return super(ASN1F_STRING_PacketField, self).i2m(pkt, val)
 
     def any2i(self, pkt, x):
@@ -1006,15 +1006,15 @@ def __init__(self,
                  ):
         # type: (...) -> None
         self.cls = cls
-        super(ASN1F_STRING_ENCAPS, self).__init__(  # type: ignore
+        super(ASN1F_STRING_ENCAPS, self).__init__(
             name,
-            default and bytes(default),
+            default and bytes(default),  # type: ignore
             context=context,
             implicit_tag=implicit_tag,
             explicit_tag=explicit_tag
         )
 
-    def m2i(self, pkt, s):
-        # type: (ASN1_Packet, bytes) -> Tuple[Optional[ASN1_Packet], bytes]
+    def m2i(self, pkt, s):  # type: ignore
+        # type: (ASN1_Packet, bytes) -> Tuple[ASN1_Packet, bytes]
         val = super(ASN1F_STRING_ENCAPS, self).m2i(pkt, s)
         return self.cls(val[0].val, _underlayer=pkt), val[1]

scapy/layers/x509.py

@@ -122,6 +122,7 @@ class RSAPrivateKey(ASN1_Packet):
 ####################################
 # From X9.42 (or RFC3279)
 
+
 class ValidationParms(ASN1_Packet):
     ASN1_codec = ASN1_Codecs.BER
     ASN1_root = ASN1F_SEQUENCE(
@@ -1184,14 +1185,17 @@ class X509_CRL(ASN1_Packet):
 
 # RFC3852 sect 5.2
 
+# Other layers should store the structures that can be encapsulated
+# by CMS here, referred by their OIDs.
 _CMS_ENCAPSULATED = {}
 
+
 class _EncapsulatedContent_Field(ASN1F_STRING_PacketField):
     def m2i(self, pkt, s):
         val = super(_EncapsulatedContent_Field, self).m2i(pkt, s)
         if not val[0].val:
             return val
-        
+
         # Get encapsulated value from its type
         if pkt.eContentType.val in _CMS_ENCAPSULATED:
             return (
@@ -1217,7 +1221,8 @@ class CMS_EncapsulatedContentInfo(ASN1_Packet):
 
 class CMS_RevocationInfoChoice(ASN1_Packet):
     ASN1_codec = ASN1_Codecs.BER
-    ASN1_root = ASN1F_CHOICE("crl", None,
+    ASN1_root = ASN1F_CHOICE(
+        "crl", None,
         ASN1F_PACKET("crl", X509_CRL(), X509_Cert),
         # -- TODO: 1
     )
@@ -1227,11 +1232,13 @@ class CMS_RevocationInfoChoice(ASN1_Packet):
 
 class CMS_CertificateChoices(ASN1_Packet):
     ASN1_codec = ASN1_Codecs.BER
-    ASN1_root = ASN1F_CHOICE("certificate", None,
+    ASN1_root = ASN1F_CHOICE(
+        "certificate", None,
         ASN1F_PACKET("certificate", X509_Cert(), X509_Cert),
         # -- TODO: 0, 1, 2
     )
 
+
 # RFC3852 sect 10.2.4
 
 class CMS_IssuerAndSerialNumber(ASN1_Packet):
@@ -1244,9 +1251,6 @@ class CMS_IssuerAndSerialNumber(ASN1_Packet):
 
 # RFC3852 sect 5.3
 
-CMS_SignerIdentifier = lambda name: ASN1F_CHOICE(name, None,
-    CMSVersion("version", 1),
-)
 
 class CMS_Attribute(ASN1_Packet):
     ASN1_codec = ASN1_Codecs.BER
@@ -1261,7 +1265,8 @@ class CMS_SignerInfo(ASN1_Packet):
     ASN1_root = ASN1F_SEQUENCE(
         CMSVersion("version", 1),
         ASN1F_PACKET("sid", CMS_IssuerAndSerialNumber(), CMS_IssuerAndSerialNumber),
-        ASN1F_PACKET("digestAlgorithm", X509_AlgorithmIdentifier(), X509_AlgorithmIdentifier),
+        ASN1F_PACKET("digestAlgorithm", X509_AlgorithmIdentifier(),
+                     X509_AlgorithmIdentifier),
         ASN1F_optional(
             ASN1F_SET_OF(
                 "signedAttrs",
@@ -1270,7 +1275,8 @@ class CMS_SignerInfo(ASN1_Packet):
                 implicit_tag=0xA0,
             )
         ),
-        ASN1F_PACKET("signatureAlgorithm", X509_AlgorithmIdentifier(), X509_AlgorithmIdentifier),
+        ASN1F_PACKET("signatureAlgorithm", X509_AlgorithmIdentifier(),
+                     X509_AlgorithmIdentifier),
         ASN1F_STRING("signature", ASN1_UTF8_STRING("")),
         ASN1F_optional(
             ASN1F_SET_OF(
@@ -1317,6 +1323,7 @@ class CMS_SignedData(ASN1_Packet):
 
 # RFC3852 sect 3
 
+
 class CMS_ContentInfo(ASN1_Packet):
     ASN1_codec = ASN1_Codecs.BER
     ASN1_root = ASN1F_SEQUENCE(