cryptoparser 0.12.0__tar.gz → 0.12.2__tar.gz

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/CHANGELOG.rst

@@ -2,6 +2,32 @@
 Changelog
 =========
 
+-------------------
+0.12.2 - 2024-01-11
+-------------------
+
+Improvements
+============
+
+-  Generic
+
+   -  add metadata to documentation
+
+-------------------
+0.12.1 - 2023-12-13
+-------------------
+
+Notable fixes
+=============
+
+-  SSH
+
+   -  add missing host key algorithms to key parser classes (#79)
+
+-  Generic
+
+   -  fix markdown generation in the case of TLS client versions (#80)
+
 -------------------
 0.12.0 - 2023-11-23
 -------------------

{CryptoParser-0.12.0 → CryptoParser-0.12.2/CryptoParser.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: CryptoParser
-Version: 0.12.0
-Summary: Fast and flexible security protocol parser and generator
+Version: 0.12.2
+Summary: An analysis oriented security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
 Maintainer: Szilárd Pfeiffer
@@ -48,7 +48,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs<22.0.1,>=20.3.0
-Requires-Dist: cryptodatahub==0.11.2
+Requires-Dist: cryptodatahub==0.12.2
 Requires-Dist: python-dateutil
 Requires-Dist: py2-ipaddress; python_version < "3.4"
 Requires-Dist: typing; python_version < "3.5"

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/CryptoParser.egg-info/requires.txt

@@ -1,6 +1,6 @@
 asn1crypto
 attrs<22.0.1,>=20.3.0
-cryptodatahub==0.11.2
+cryptodatahub==0.12.2
 python-dateutil
 python-dateutil
 urllib3

{CryptoParser-0.12.0/CryptoParser.egg-info → CryptoParser-0.12.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: CryptoParser
-Version: 0.12.0
-Summary: Fast and flexible security protocol parser and generator
+Version: 0.12.2
+Summary: An analysis oriented security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
 Maintainer: Szilárd Pfeiffer
@@ -48,7 +48,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs<22.0.1,>=20.3.0
-Requires-Dist: cryptodatahub==0.11.2
+Requires-Dist: cryptodatahub==0.12.2
 Requires-Dist: python-dateutil
 Requires-Dist: py2-ipaddress; python_version < "3.4"
 Requires-Dist: typing; python_version < "3.5"

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/cryptoparser/__setup__.py

@@ -2,8 +2,8 @@
 
 __title__ = 'CryptoParser'
 __technical_name__ = __title__.lower()
-__version__ = '0.12.0'
-__description__ = 'Fast and flexible security protocol parser and generator'
+__version__ = '0.12.2'
+__description__ = 'An analysis oriented security protocol parser and generator'
 __author__ = 'Szilárd Pfeiffer'
 __author_email__ = 'coroner@pfeifferszilard.hu'
 __url__ = 'https://gitlab.com/coroner/' + __technical_name__

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/cryptoparser/common/base.py

@@ -61,7 +61,6 @@ class SerializableTextEncoder(object):
 
 class Serializable(object):  # pylint: disable=too-few-public-methods
     _MARKDOWN_RESULT_STRING_CLASSES = (
-        CryptoDataParamsBase,
         ipaddress.IPv4Network,
         ipaddress.IPv6Network,
         urllib3.util.url.Url,
@@ -143,7 +142,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
             ])
         elif hasattr(obj, '__dict__'):
             result = Serializable._json_traverse(obj.__dict__, result_func)
-        elif isinstance(obj, (list, tuple)):
+        elif isinstance(obj, (list, tuple, frozenset, set)):
             result = [Serializable._json_traverse(item, result_func) for item in obj]
         else:
             result = result_func(obj)
@@ -227,7 +226,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
         return not isinstance(obj, enum.Enum) and isinstance(obj, six.string_types + six.integer_types + (float, ))
 
     @classmethod
-    def _markdown_result(cls, obj, level=0):  # pylint: disable=too-many-branches
+    def _markdown_result(cls, obj, level=0):  # pylint: disable=too-many-branches,too-many-return-statements
         if obj is None:
             result = cls.post_text_encoder('n/a', level)
         elif isinstance(obj, bool):
@@ -245,17 +244,19 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
                 return cls.post_text_encoder(obj.value, level)
 
             return cls.post_text_encoder(obj.name, level)
-        elif attr.has(type(obj)):
-            result = cls._markdown_result_complex(obj, level)
         elif isinstance(obj, cls._MARKDOWN_RESULT_STRING_CLASSES):
             return False, str(obj)
         elif isinstance(obj, datetime.timedelta):
             return False, str(obj.seconds)
+        elif isinstance(obj, CryptoDataParamsBase) and hasattr(obj, '__str__'):
+            return False, str(obj)
+        elif attr.has(type(obj)):
+            result = cls._markdown_result_complex(obj, level)
         elif hasattr(obj, '_asdict'):
             result = cls._markdown_result(obj._asdict(), level)
         elif hasattr(obj, '__dict__') or isinstance(obj, dict):
             result = cls._markdown_result_complex(obj, level)
-        elif isinstance(obj, (list, tuple, set, ArrayBase)):
+        elif isinstance(obj, (list, tuple, frozenset, set, ArrayBase)):
             result = cls._markdown_result_list(obj, level)
         elif isinstance(obj, (bytes, bytearray)):
             result = cls.post_text_encoder(bytes_to_hex_string(obj, separator=':', lowercase=False), level)

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/cryptoparser/ssh/key.py

@@ -7,6 +7,7 @@ import binascii
 import collections
 import datetime
 import enum
+import itertools
 import textwrap
 
 from collections import OrderedDict
@@ -26,7 +27,7 @@ from cryptodatahub.common.key import (
     PublicKeyParamsRsa,
 )
 from cryptodatahub.common.utils import hash_bytes
-from cryptodatahub.ssh.algorithm import SshHostKeyAlgorithm, SshEllipticCurveIdentifier
+from cryptodatahub.ssh.algorithm import SshHostKeyAlgorithm, SshHostKeyType, SshEllipticCurveIdentifier
 
 from cryptoparser.common.base import (
     FourByteEnumComposer,
@@ -174,13 +175,13 @@ class SshHostKeyDSSBase(SshHostKeyBase):
 
     @classmethod
     def get_host_key_algorithms(cls):
-        return [
-            SshHostKeyAlgorithm.SSH_DSS,
-            SshHostKeyAlgorithm.SSH_DSS_SHA224_SSH_COM,
-            SshHostKeyAlgorithm.SSH_DSS_SHA256_SSH_COM,
-            SshHostKeyAlgorithm.SSH_DSS_SHA384_SSH_COM,
-            SshHostKeyAlgorithm.SSH_DSS_SHA512_SSH_COM,
-        ]
+        return filter(
+            lambda host_key_algorithm: (
+                host_key_algorithm.value.key_type == SshHostKeyType.HOST_KEY and
+                host_key_algorithm.value.signature.value.key_type == Authentication.DSS
+            ),
+            SshHostKeyAlgorithm
+        )
 
     @classmethod
     def _parse_host_key(cls, parser):
@@ -233,13 +234,13 @@ class SshHostKeyRSABase(SshHostKeyBase):
 
     @classmethod
     def get_host_key_algorithms(cls):
-        return [
-            SshHostKeyAlgorithm.SSH_RSA,
-            SshHostKeyAlgorithm.SSH_RSA_SHA224_SSH_COM,
-            SshHostKeyAlgorithm.SSH_RSA_SHA256_SSH_COM,
-            SshHostKeyAlgorithm.SSH_RSA_SHA384_SSH_COM,
-            SshHostKeyAlgorithm.SSH_RSA_SHA512_SSH_COM,
-        ]
+        return filter(
+            lambda host_key_algorithm: (
+                host_key_algorithm.value.key_type == SshHostKeyType.HOST_KEY and
+                host_key_algorithm.value.signature.value.key_type == Authentication.RSA
+            ),
+            SshHostKeyAlgorithm
+        )
 
     @classmethod
     def _parse_host_key(cls, parser):
@@ -279,11 +280,13 @@ class SshHostKeyECDSABase(SshHostKeyBase):
 
     @classmethod
     def get_host_key_algorithms(cls):
-        return [
-            SshHostKeyAlgorithm.ECDSA_SHA2_NISTP256,
-            SshHostKeyAlgorithm.ECDSA_SHA2_NISTP384,
-            SshHostKeyAlgorithm.ECDSA_SHA2_NISTP521,
-        ]
+        return filter(
+            lambda host_key_algorithm: (
+                host_key_algorithm.value.key_type == SshHostKeyType.HOST_KEY and
+                host_key_algorithm.value.signature.value.key_type == Authentication.ECDSA
+            ),
+            SshHostKeyAlgorithm
+        )
 
     @classmethod
     def _parse_host_key(cls, parser):
@@ -328,7 +331,13 @@ class SshHostKeyEDDSABase(SshHostKeyBase):
 
     @classmethod
     def get_host_key_algorithms(cls):
-        return [SshHostKeyAlgorithm.SSH_ED25519, ]
+        return filter(
+            lambda host_key_algorithm: (
+                host_key_algorithm.value.key_type == SshHostKeyType.HOST_KEY and
+                host_key_algorithm.value.signature.value.key_type == Authentication.EDDSA
+            ),
+            SshHostKeyAlgorithm
+        )
 
     @classmethod
     def _parse_host_key(cls, parser):
@@ -1043,6 +1052,7 @@ class SshHostCertificateV01ECDSA(SshHostCertificateV01ECDSABase, SshHostCertific
             SshHostKeyAlgorithm.ECDSA_SHA2_NISTP256_CERT_V01_OPENSSH_COM,
             SshHostKeyAlgorithm.ECDSA_SHA2_NISTP384_CERT_V01_OPENSSH_COM,
             SshHostKeyAlgorithm.ECDSA_SHA2_NISTP521_CERT_V01_OPENSSH_COM,
+            SshHostKeyAlgorithm.ECDSA_SHA2_SECP256K1_OID_CERT_V01_OPENSSH_COM,
         ]
 
 
@@ -1069,20 +1079,10 @@ class SshX509Certificate(ParsableBase, SshHostKeyBase):
 
     @classmethod
     def get_host_key_algorithms(cls):
-        return [
-            SshHostKeyAlgorithm.X509V3_SIGN_RSA,
-            SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA1,
-            SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA224_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA256_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA384_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA512_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_DSS,
-            SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA1,
-            SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA224_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA256_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA384_SSH_COM,
-            SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA512_SSH_COM,
-        ]
+        return filter(
+            lambda host_key_algorithm: host_key_algorithm.value.key_type == SshHostKeyType.X509_CERTIFICATE,
+            SshHostKeyAlgorithm
+        )
 
     @property
     def key_bytes(self):
@@ -1142,15 +1142,10 @@ class SshX509CertificateChain(ParsableBase, SshHostKeyBase):
 
     @classmethod
     def get_host_key_algorithms(cls):
-        return [
-            SshHostKeyAlgorithm.X509V3_SSH_DSS,
-            SshHostKeyAlgorithm.X509V3_SSH_RSA,
-            SshHostKeyAlgorithm.X509V3_RSA2048_SHA256,
-            SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_1_3_132_0_10,
-            SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_NISTP256,
-            SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_NISTP384,
-            SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_NISTP521,
-        ]
+        return filter(
+            lambda host_key_algorithm: host_key_algorithm.value.key_type == SshHostKeyType.X509_CERTIFICATE_CHAIN,
+            SshHostKeyAlgorithm
+        )
 
     @property
     def key_bytes(self):
@@ -1199,44 +1194,26 @@ class SshX509CertificateChain(ParsableBase, SshHostKeyBase):
 
 
 class SshHostPublicKeyVariant(VariantParsable):
-    _VARIANTS = collections.OrderedDict([
-        (SshHostKeyAlgorithm.SSH_ED25519, (SshHostKeyEDDSA, )),
-        (SshHostKeyAlgorithm.SSH_RSA, (SshHostKeyRSA, )),
-        (SshHostKeyAlgorithm.RSA_SHA2_256, (SshHostKeyRSA, )),
-        (SshHostKeyAlgorithm.RSA_SHA2_512, (SshHostKeyRSA, )),
-        (SshHostKeyAlgorithm.SSH_DSS, (SshHostKeyDSS, )),
-        (SshHostKeyAlgorithm.ECDSA_SHA2_NISTP256, (SshHostKeyECDSA, )),
-        (SshHostKeyAlgorithm.ECDSA_SHA2_NISTP384, (SshHostKeyECDSA, )),
-        (SshHostKeyAlgorithm.ECDSA_SHA2_NISTP521, (SshHostKeyECDSA, )),
-        (SshHostKeyAlgorithm.SSH_DSS_CERT_V00_OPENSSH_COM, (SshHostCertificateV00DSS, )),
-        (SshHostKeyAlgorithm.SSH_RSA_CERT_V00_OPENSSH_COM, (SshHostCertificateV00RSA, )),
-        (SshHostKeyAlgorithm.SSH_DSS_CERT_V01_OPENSSH_COM, (SshHostCertificateV01DSS, )),
-        (SshHostKeyAlgorithm.SSH_RSA_CERT_V01_OPENSSH_COM, (SshHostCertificateV01RSA, )),
-        (SshHostKeyAlgorithm.ECDSA_SHA2_NISTP256_CERT_V01_OPENSSH_COM, (SshHostCertificateV01ECDSA, )),
-        (SshHostKeyAlgorithm.ECDSA_SHA2_NISTP384_CERT_V01_OPENSSH_COM, (SshHostCertificateV01ECDSA, )),
-        (SshHostKeyAlgorithm.ECDSA_SHA2_NISTP521_CERT_V01_OPENSSH_COM, (SshHostCertificateV01ECDSA, )),
-        (SshHostKeyAlgorithm.SSH_ED25519_CERT_V01_OPENSSH_COM, (SshHostCertificateV01EDDSA, )),
-        (SshHostKeyAlgorithm.X509V3_RSA2048_SHA256, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_SSH_DSS, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_SSH_RSA, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_1_3_132_0_10, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_NISTP256, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_NISTP384, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_ECDSA_SHA2_NISTP521, (SshX509CertificateChain, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA1, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA1, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA224_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA256_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA384_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_RSA_SHA512_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA1, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA224_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA256_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA384_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS_SHA512_SSH_COM, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_RSA, (SshX509Certificate, )),
-        (SshHostKeyAlgorithm.X509V3_SIGN_DSS, (SshX509Certificate, )),
-    ])
+    _VARIANTS = collections.OrderedDict(itertools.chain.from_iterable([
+        [
+            (host_key_algorithm, (ssh_key_class, ))
+            for host_key_algorithm in ssh_key_class.get_host_key_algorithms()
+        ]
+        for ssh_key_class in [
+            SshHostKeyDSS,
+            SshHostKeyECDSA,
+            SshHostKeyEDDSA,
+            SshHostKeyRSA,
+            SshHostCertificateV00DSS,
+            SshHostCertificateV00RSA,
+            SshHostCertificateV01DSS,
+            SshHostCertificateV01ECDSA,
+            SshHostCertificateV01EDDSA,
+            SshHostCertificateV01RSA,
+            SshX509Certificate,
+            SshX509CertificateChain,
+        ]
+    ]))
 
     @classmethod
     def _get_variants(cls):

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/cryptoparser/tls/version.py

@@ -78,8 +78,10 @@ class TlsProtocolVersion(ProtocolVersionBase, GradeableSimple):
             return self.minor < other.minor
         if self.is_draft:
             return other.version == TlsVersion.TLS1_3
+        if other.is_draft:
+            return self.version != TlsVersion.TLS1_3
 
-        return self.version != TlsVersion.TLS1_3
+        return self.major < other.major
 
     @property
     def identifier(self):

{CryptoParser-0.12.0 → CryptoParser-0.12.2}/requirements.txt

@@ -1,6 +1,6 @@
 asn1crypto
 attrs>=20.3.0,<22.0.1
-cryptodatahub==0.11.2
+cryptodatahub==0.12.2
 python-dateutil
 py2-ipaddress;python_version<"3.4"
 typing;python_version<"3.5"