Commit 80189fea authored by Szilárd Pfeiffer's avatar Szilárd Pfeiffer
Browse files

pylint: Fix errors reported by newer version of pylint

parent 0116f347

cryptoparser/common/algorithm.py

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class KeyExchange(enum.Enum): 




class Authentication(AlgortihmOIDBase, enum.Enum):

    anon = AuthenticationParams(

    anon = AuthenticationParams(  # pylint: disable=invalid-name

        name='anon',

        oid=None,

        anonymous=True,

cryptoparser/common/parse.py

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ class ParserBinary(ParserBase): 


    def parse_parsable_array(self, name, items_size, item_class, fallback_class=None):

        try:

            return self._parse_parsable_derived_array(name, items_size, [item_class, ], fallback_class)

            self._parse_parsable_derived_array(name, items_size, [item_class, ], fallback_class)

        except NotEnoughData as e:

            raise e

        except ValueError as e:
@@ -510,7 +510,7 @@ class ParserBinary(ParserBase): 
    def parse_parsable_derived_array(self, name, items_size, item_base_class, fallback_class=None):

        item_classes = cryptoparser.common.utils.get_leaf_classes(item_base_class)

        try:

            return self._parse_parsable_derived_array(name, items_size, item_classes, fallback_class)

            self._parse_parsable_derived_array(name, items_size, item_classes, fallback_class)

        except NotEnoughData as e:

            raise e

        except ValueError as e:

cryptoparser/tls/ciphersuite.py

+27 −27
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 = CipherSuiteParams(

    TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x0017,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -254,7 +254,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.MD5,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_RC4_128_MD5 = CipherSuiteParams(

    TLS_DH_anon_WITH_RC4_128_MD5 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x0018,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -263,7 +263,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.MD5,

        authenticated_encryption=False,

    )

    TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x0019,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -272,7 +272,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_DES_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_DES_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x001a,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -281,7 +281,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_3DES_EDE_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_3DES_EDE_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x001b,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -506,7 +506,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_AES_128_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_AES_128_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x0034,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -560,7 +560,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_AES_256_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_AES_256_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x003a,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -668,7 +668,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x0046,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -840,7 +840,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_AES_128_CBC_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_AES_128_CBC_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x006c,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -849,7 +849,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_AES_256_CBC_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_AES_256_CBC_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x006d,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -939,7 +939,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x0089,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -1101,7 +1101,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_SEED_CBC_SHA = CipherSuiteParams(

    TLS_DH_anon_WITH_SEED_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x009b,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -1200,7 +1200,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_384,

        authenticated_encryption=True,

    )

    TLS_DH_anon_WITH_AES_128_GCM_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_AES_128_GCM_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x00a6,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -1209,7 +1209,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=True,

    )

    TLS_DH_anon_WITH_AES_256_GCM_SHA384 = CipherSuiteParams(

    TLS_DH_anon_WITH_AES_256_GCM_SHA384 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x00a7,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -1425,7 +1425,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x00bf,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -1479,7 +1479,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0x00c5,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -1704,7 +1704,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_ECDH_anon_WITH_NULL_SHA = CipherSuiteParams(

    TLS_ECDH_anon_WITH_NULL_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc015,

        key_exchange=KeyExchange.ECDH,

        authentication=Authentication.anon,
@@ -1713,7 +1713,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_ECDH_anon_WITH_RC4_128_SHA = CipherSuiteParams(

    TLS_ECDH_anon_WITH_RC4_128_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc016,

        key_exchange=KeyExchange.ECDH,

        authentication=Authentication.anon,
@@ -1722,7 +1722,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA = CipherSuiteParams(

    TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc017,

        key_exchange=KeyExchange.ECDH,

        authentication=Authentication.anon,
@@ -1731,7 +1731,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_ECDH_anon_WITH_AES_128_CBC_SHA = CipherSuiteParams(

    TLS_ECDH_anon_WITH_AES_128_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc018,

        key_exchange=KeyExchange.ECDH,

        authentication=Authentication.anon,
@@ -1740,7 +1740,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA1,

        authenticated_encryption=False,

    )

    TLS_ECDH_anon_WITH_AES_256_CBC_SHA = CipherSuiteParams(

    TLS_ECDH_anon_WITH_AES_256_CBC_SHA = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc019,

        key_exchange=KeyExchange.ECDH,

        authentication=Authentication.anon,
@@ -2145,7 +2145,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_384,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_ARIA_128_CBC_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_ARIA_128_CBC_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc046,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -2154,7 +2154,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=False,

    )

    TLS_DH_anon_WITH_ARIA_256_CBC_SHA384 = CipherSuiteParams(

    TLS_DH_anon_WITH_ARIA_256_CBC_SHA384 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc047,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -2325,7 +2325,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_384,

        authenticated_encryption=True,

    )

    TLS_DH_anon_WITH_ARIA_128_GCM_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_ARIA_128_GCM_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc05a,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -2334,7 +2334,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=True,

    )

    TLS_DH_anon_WITH_ARIA_256_GCM_SHA384 = CipherSuiteParams(

    TLS_DH_anon_WITH_ARIA_256_GCM_SHA384 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc05b,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -2703,7 +2703,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_384,

        authenticated_encryption=True,

    )

    TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256 = CipherSuiteParams(

    TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc084,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,
@@ -2712,7 +2712,7 @@ class TlsCipherSuite(TwoByteEnumComposer): 
        mac=MAC.SHA2_256,

        authenticated_encryption=True,

    )

    TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384 = CipherSuiteParams(

    TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384 = CipherSuiteParams(  # pylint: disable=invalid-name

        code=0xc085,

        key_exchange=KeyExchange.ADH,

        authentication=Authentication.anon,

cryptoparser/tls/ldap.py

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ class LDAPMessageParsableBase(ParsableBase): 
            message = LDAPMessage.load(bytes(parsable))

            # ensure recursive parsing

            message.native  # pylint: disable=pointless-statement

            return message

        except ValueError as e:

            match = cls._NOT_ENOUGH_DATA_REGEX.match(e.args[0])

            if match:
@@ -162,6 +161,8 @@ class LDAPMessageParsableBase(ParsableBase): 
            else:

                six.raise_from(InvalidValue(parsable, cls), e)



        return message





class LDAPExtendedRequestStartTLS(LDAPMessageParsableBase):

    @classmethod

test/common/classes.py

+6 −6
Original line number Diff line number Diff line
@@ -203,23 +203,23 @@ class SerializableEnumFactory(TwoByteEnumParsable): 




class SerializableEnum(TwoByteEnumComposer):

    first = SerializableEnumValue(

    FIRST = SerializableEnumValue(

        code=0x0001,

    )

    second = SerializableEnumValue(

    SECOND = SerializableEnumValue(

        code=0x0002,

    )





class SerializableStringEnum(enum.Enum):

    first = '1'

    second = '2'

    FIRST = '1'

    SECOND = '2'





class SerializableEnums(Serializable):

    def __init__(self):

        self.param_enum = SerializableEnum.first

        self.string_enum = SerializableStringEnum.second

        self.param_enum = SerializableEnum.FIRST

        self.string_enum = SerializableStringEnum.SECOND





class SerializableHidden(Serializable):