cryptoparser 0.9.0__tar.gz → 0.9.1__tar.gz

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/CHANGELOG.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.9.1 - 2022-06-22
+------------------
+
+-  TLS (``tls``)
+
+   -  Generic
+
+      -  add parser for `signed certificate timestamp <https://www.rfc-editor.org/rfc/rfc6962.html#section-3.3.1>`__
+         entries (#52)
+
 0.9.0 - 2023-04-29
 ------------------
 

{cryptoparser-0.9.0 → CryptoParser-0.9.1/CryptoParser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: cryptoparser
-Version: 0.9.0
+Name: CryptoParser
+Version: 0.9.1
 Summary: Fast and flexible security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
@@ -88,3 +88,9 @@ The code is available under the terms of Mozilla Public License Version 2.0 (MPL
 
 A non-comprehensive, but straightforward description of MPL 2.0 can be found at
 `Choose an open source license <https://choosealicense.com/licenses#mpl-2.0>`__ website.
+
+Credits
+-------
+
+-  `NLnet Foundation <https://nlnet.nl>`__ and `NGI Assure <https://www.assure.ngi.eu>`__, supports the project part of
+   the `Next Generation Internet <https://ngi.eu>`__ initiative.

{cryptoparser-0.9.0/cryptoparser.egg-info → CryptoParser-0.9.1/CryptoParser.egg-info}/SOURCES.txt

@@ -5,12 +5,13 @@ MANIFEST.in
 README.rst
 requirements.txt
 setup.py
+CryptoParser.egg-info/PKG-INFO
+CryptoParser.egg-info/SOURCES.txt
+CryptoParser.egg-info/dependency_links.txt
+CryptoParser.egg-info/requires.txt
+CryptoParser.egg-info/top_level.txt
 cryptoparser/__init__.py
-cryptoparser.egg-info/PKG-INFO
-cryptoparser.egg-info/SOURCES.txt
-cryptoparser.egg-info/dependency_links.txt
-cryptoparser.egg-info/requires.txt
-cryptoparser.egg-info/top_level.txt
+cryptoparser/__setup__.py
 cryptoparser/common/__init__.py
 cryptoparser/common/base.py
 cryptoparser/common/classes.py

{cryptoparser-0.9.0/cryptoparser.egg-info → CryptoParser-0.9.1/CryptoParser.egg-info}/requires.txt

@@ -1,5 +1,6 @@
 asn1crypto
-cryptodatahub>=0.8.5
+attrs<22.0.1,>=19.1
+cryptodatahub>=0.9.1
 python-dateutil
 python-dateutil
 
@@ -13,6 +14,7 @@ typing
 enum34==1.1.6
 pathlib2==2.3.7.post1
 Mock
+unittest2
 
 [pep8]
 flake8
@@ -21,6 +23,4 @@ flake8
 pylint
 
 [test]
-unittest2
 coverage
-six

{cryptoparser-0.9.0/cryptoparser.egg-info → CryptoParser-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: cryptoparser
-Version: 0.9.0
+Name: CryptoParser
+Version: 0.9.1
 Summary: Fast and flexible security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
@@ -88,3 +88,9 @@ The code is available under the terms of Mozilla Public License Version 2.0 (MPL
 
 A non-comprehensive, but straightforward description of MPL 2.0 can be found at
 `Choose an open source license <https://choosealicense.com/licenses#mpl-2.0>`__ website.
+
+Credits
+-------
+
+-  `NLnet Foundation <https://nlnet.nl>`__ and `NGI Assure <https://www.assure.ngi.eu>`__, supports the project part of
+   the `Next Generation Internet <https://ngi.eu>`__ initiative.

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/README.rst

@@ -36,3 +36,9 @@ The code is available under the terms of Mozilla Public License Version 2.0 (MPL
 
 A non-comprehensive, but straightforward description of MPL 2.0 can be found at
 `Choose an open source license <https://choosealicense.com/licenses#mpl-2.0>`__ website.
+
+Credits
+-------
+
+-  `NLnet Foundation <https://nlnet.nl>`__ and `NGI Assure <https://www.assure.ngi.eu>`__, supports the project part of
+   the `Next Generation Internet <https://ngi.eu>`__ initiative.

CryptoParser-0.9.1/cryptoparser/__setup__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+__title__ = 'CryptoParser'
+__technical_name__ = __title__.lower()
+__version__ = '0.9.1'
+__description__ = 'Fast and flexible security protocol parser and generator'
+__author__ = 'Szilárd Pfeiffer'
+__author_email__ = 'coroner@pfeifferszilard.hu'
+__url__ = 'https://gitlab.com/coroner/' + __technical_name__
+__license__ = 'MPL-2.0'

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/cryptoparser/common/base.py

@@ -81,7 +81,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
             keys = sorted(filter(lambda key: not key.startswith('_'), dict_value.keys()))
 
         result = OrderedDict([
-            (str(key), dict_value[key])
+            (key, dict_value[key])
             for key in keys
         ])
 
@@ -135,12 +135,13 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
         name_dict = {}
         fields_dict = attr.fields_dict(type(obj)) if attr.has(type(obj)) else {}
         for name in dict_value:
-            if name in fields_dict and 'human_readable_name' in fields_dict[name].metadata:
-                human_readable_name = fields_dict[name].metadata['human_readable_name']
+            if isinstance(name, six.string_types):
+                if name in fields_dict and 'human_readable_name' in fields_dict[name].metadata:
+                    human_readable_name = fields_dict[name].metadata['human_readable_name']
+                else:
+                    human_readable_name = ' '.join(name.split('_')).title()
             else:
                 _, human_readable_name = cls._markdown_result(name)
-                if not human_readable_name.isupper():
-                    human_readable_name = ' '.join(name.split('_')).title()
             name_dict[name] = human_readable_name
 
         return name_dict
@@ -192,7 +193,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def _markdown_is_directly_printable(obj):
-        return isinstance(obj, six.string_types + six.integer_types + (float, ))
+        return not isinstance(obj, enum.Enum) and isinstance(obj, six.string_types + six.integer_types + (float, ))
 
     @classmethod
     def _markdown_result(cls, obj, level=0):
@@ -211,6 +212,8 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
                 return False, str(obj.value)
 
             return False, obj.name
+        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)):

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/cryptoparser/common/parse.py

@@ -457,16 +457,21 @@ class ParserText(ParserBase):
 class ParserBinary(ParserBase):
     byte_order = attr.ib(default=ByteOrder.NETWORK, validator=attr.validators.in_(ByteOrder))
 
-    def parse_timestamp(self, name):
+    def parse_timestamp(self, name, milliseconds=False):
         value, parsed_length = self._parse_numeric_array(name, 1, 8, int)
 
         self._parsed_length += parsed_length
         if value[0] == 0xffffffffffffffff:
             self._parsed_values[name] = None
         else:
-            self._parsed_values[name] = datetime.datetime.fromtimestamp(
-                0x00000000ffffffff & value[0], dateutil.tz.UTC
-            )
+            value = value[0]
+            if milliseconds:
+                millis = value % 1000
+                value //= 1000
+            value = datetime.datetime.fromtimestamp(0x00000000ffffffff & value, dateutil.tz.UTC)
+            if milliseconds:
+                value += datetime.timedelta(milliseconds=millis)
+            self._parsed_values[name] = value
 
     def _parse_numeric_array(self, name, item_num, item_size, item_numeric_class):
         if self._parsed_length + (item_num * item_size) > len(self._parsable):
@@ -573,7 +578,7 @@ class ParserBinary(ParserBase):
     def parse_raw(self, name, size):
         parsed_bytes = self._parse_bytes(size)
 
-        self._parsed_values[name] = parsed_bytes
+        self._parsed_values[name] = bytearray(parsed_bytes)
         self._parsed_length += size
 
     def parse_string(self, name, item_size, encoding, converter=str):
@@ -782,13 +787,17 @@ class ComposerText(ComposerBase):
 class ComposerBinary(ComposerBase):
     byte_order = attr.ib(default=ByteOrder.NETWORK, validator=attr.validators.in_(ByteOrder))
 
-    def compose_timestamp(self, value):
+    def compose_timestamp(self, value, milliseconds=False):
         if value is None:
-            value = 0xffffffffffffffff
+            timestamp = 0xffffffffffffffff
         else:
-            value = int(time.mktime(value.timetuple())) - time.timezone
+            timestamp = int(time.mktime(value.timetuple())) - time.timezone
+
+            if milliseconds:
+                timestamp *= 1000
+                timestamp += value.microsecond // 1000
 
-        return self._compose_numeric_array([value, ], 8)
+        return self._compose_numeric_array([timestamp, ], 8)
 
     def _compose_numeric_array(self, values, item_size):
         composed_bytes = bytearray()

CryptoParser-0.9.1/cryptoparser/common/x509.py

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+
+import datetime
+import enum
+
+import attr
+
+from cryptodatahub.common.stores import CertificateTransparencyLog, CertificateTransparencyLogParamsBase
+
+from cryptoparser.common.base import (
+    Opaque,
+    OpaqueParam,
+    Serializable,
+    VectorParamParsable,
+    VectorParsable,
+)
+from cryptoparser.common.parse import ComposerBinary, ParsableBase, ParserBinary
+
+from cryptoparser.tls.algorithm import TlsSignatureAndHashAlgorithm, TlsSignatureAndHashAlgorithmFactory
+
+
+class CtExtensions(Opaque):
+    @classmethod
+    def get_param(cls):
+        return OpaqueParam(
+            min_byte_num=0,
+            max_byte_num=2 ** 16 - 1,
+        )
+
+
+class CtSignature(Opaque):
+    @classmethod
+    def get_param(cls):
+        return OpaqueParam(
+            min_byte_num=0,
+            max_byte_num=2 ** 16 - 1,
+        )
+
+
+class CtVersion(enum.IntEnum):
+    V1 = 0x00  # pylint: disable=invalid-name
+
+
+@attr.s
+class SignedCertificateTimestamp(ParsableBase, Serializable):
+    version = attr.ib(validator=attr.validators.in_(CtVersion))
+    log = attr.ib(
+        converter=CertificateTransparencyLog.from_log_id,
+        validator=attr.validators.instance_of(CertificateTransparencyLogParamsBase)
+    )
+    timestamp = attr.ib(validator=attr.validators.instance_of(datetime.datetime))
+    extensions = attr.ib(
+        validator=attr.validators.deep_iterable(member_validator=attr.validators.instance_of(CtExtensions))
+    )
+    signature_algorithm = attr.ib(validator=attr.validators.in_(TlsSignatureAndHashAlgorithm))
+    signature = attr.ib(
+        converter=CtSignature,
+        validator=attr.validators.instance_of(CtSignature),
+        metadata={'human_friendly': False},
+    )
+
+    @classmethod
+    def _parse(cls, parsable):
+        header_parser = ParserBinary(parsable)
+        header_parser.parse_bytes('sct', 2)
+
+        body_parser = ParserBinary(header_parser['sct'])
+
+        body_parser.parse_numeric('version', 1, CtVersion)
+        body_parser.parse_raw('log', 32)
+        body_parser.parse_timestamp('timestamp', milliseconds=True)
+        body_parser.parse_parsable('extensions', CtExtensions)
+        body_parser.parse_parsable('signature_algorithm', TlsSignatureAndHashAlgorithmFactory)
+        body_parser.parse_parsable('signature', CtSignature)
+
+        return cls(**body_parser), header_parser.parsed_length
+
+    def compose(self):
+        body_composer = ComposerBinary()
+
+        body_composer.compose_numeric(self.version, 1)
+        body_composer.compose_raw(self.log.log_id.value)
+        body_composer.compose_timestamp(self.timestamp, milliseconds=True)
+        body_composer.compose_parsable(self.extensions)
+        body_composer.compose_numeric_enum_coded(self.signature_algorithm)
+        body_composer.compose_parsable(self.signature)
+
+        header_composer = ComposerBinary()
+        header_composer.compose_numeric(len(body_composer.composed_bytes), 2)
+
+        return header_composer.composed_bytes + body_composer.composed_bytes
+
+
+class SignedCertificateTimestampList(VectorParsable):
+    @classmethod
+    def get_param(cls):
+        return VectorParamParsable(
+            item_class=SignedCertificateTimestamp,
+            fallback_class=None,
+            min_byte_num=0, max_byte_num=2 ** 16 - 1
+        )

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/cryptoparser/tls/extension.py

@@ -685,9 +685,9 @@ class TlsCertificateStatusRequestResponderIdList(VectorParsable):
         )
 
 
-class TlsExtensionCertificateStatusRequest(TlsExtensionParsed):
+class TlsExtensionCertificateStatusRequestClient(TlsExtensionParsed):
     def __init__(self, responder_id_list=(), extensions=()):
-        super(TlsExtensionCertificateStatusRequest, self).__init__()
+        super(TlsExtensionCertificateStatusRequestClient, self).__init__()
 
         self.responder_id_list = TlsCertificateStatusRequestResponderIdList(responder_id_list)
         self.request_extensions = TlsCertificateStatusRequestExtensions(extensions)
@@ -698,15 +698,13 @@ class TlsExtensionCertificateStatusRequest(TlsExtensionParsed):
 
     @classmethod
     def _parse(cls, parsable):
-        parser = super(TlsExtensionCertificateStatusRequest, cls)._parse_header(parsable)
-        if parser['extension_length'] == 0:
-            return TlsExtensionCertificateStatusRequest(), parser.parsed_length
+        parser = super(TlsExtensionCertificateStatusRequestClient, cls)._parse_header(parsable)
 
         parser.parse_numeric('status_type', 1, TlsCertificateStatusType)
         parser.parse_parsable('responder_id_list', TlsCertificateStatusRequestResponderIdList)
         parser.parse_parsable('extensions', TlsCertificateStatusRequestExtensions)
 
-        return TlsExtensionCertificateStatusRequest(
+        return cls(
             parser['responder_id_list'],
             parser['extensions'],
         ), parser.parsed_length
@@ -723,6 +721,12 @@ class TlsExtensionCertificateStatusRequest(TlsExtensionParsed):
         return header_bytes + payload_composer.composed_bytes
 
 
+class TlsExtensionCertificateStatusRequestServer(TlsExtensionUnusedData):
+    @classmethod
+    def get_extension_type(cls):
+        return TlsExtensionType.STATUS_REQUEST
+
+
 class TlsRenegotiatedConnection(Opaque):
     @classmethod
     def get_param(cls):
@@ -1080,7 +1084,10 @@ class TlsExtensionSignedCertificateTimestampClient(TlsExtensionUnusedData):
 
 @attr.s
 class TlsExtensionSignedCertificateTimestampServer(TlsExtensionParsed):
-    scts = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(SignedCertificateTimestampList)))
+    scts = attr.ib(
+        converter=SignedCertificateTimestampList,
+        validator=attr.validators.optional(attr.validators.instance_of(SignedCertificateTimestampList))
+    )
 
     @classmethod
     def get_extension_type(cls):
@@ -1167,7 +1174,7 @@ class TlsExtensionPadding(TlsExtensionParsed):
 
         parser.parse_raw('padding', parser['extension_length'])
         try:
-            non_zero_int = next(byte for byte in six.iterbytes(parser['padding']) if byte != 0)
+            non_zero_int = next(byte for byte in parser['padding'] if byte != 0)
             raise InvalidValue(six.int2byte(non_zero_int), cls)
         except StopIteration:
             pass
@@ -1220,7 +1227,7 @@ class TlsExtensionVariantClient(TlsExtensionVariantBase):
             (TlsExtensionType.PADDING, [TlsExtensionPadding, ]),
             (TlsExtensionType.SERVER_NAME, [TlsExtensionServerNameClient, ]),
             (TlsExtensionType.SESSION_TICKET, [TlsExtensionSessionTicket, ]),
-            (TlsExtensionType.STATUS_REQUEST, [TlsExtensionCertificateStatusRequest, ]),
+            (TlsExtensionType.STATUS_REQUEST, [TlsExtensionCertificateStatusRequestClient, ]),
             (TlsExtensionType.SUPPORTED_GROUPS, [TlsExtensionEllipticCurves, ]),
             (TlsExtensionType.DELEGATED_CREDENTIALS, [TlsExtensionDelegatedCredentials, ]),
             (TlsExtensionType.EC_POINT_FORMATS, [TlsExtensionECPointFormats, ]),
@@ -1254,5 +1261,6 @@ class TlsExtensionVariantServer(TlsExtensionVariantBase):
             (TlsExtensionType.SERVER_NAME, [TlsExtensionServerNameServer, ]),
             (TlsExtensionType.SESSION_TICKET, [TlsExtensionSessionTicket, ]),
             (TlsExtensionType.SIGNED_CERTIFICATE_TIMESTAMP, [TlsExtensionSignedCertificateTimestampServer, ]),
+            (TlsExtensionType.STATUS_REQUEST, [TlsExtensionCertificateStatusRequestServer, ]),
             (TlsExtensionType.SUPPORTED_VERSIONS, [TlsExtensionSupportedVersionsServer, ]),
         ])

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/requirements.txt

@@ -1,5 +1,6 @@
 asn1crypto
-cryptodatahub>=0.8.5
+attrs>=19.1,<22.0.1
+cryptodatahub>=0.9.1
 python-dateutil
 py2-ipaddress;python_version<"3.4"
 typing;python_version<"3.5"

{cryptoparser-0.9.0 → CryptoParser-0.9.1}/setup.py

@@ -7,6 +7,9 @@ import unittest
 
 from setuptools import setup
 
+from cryptoparser import __setup__
+
+
 this_directory = os.getenv('REQUIREMENTS_DIR', '')
 with open(os.path.join(this_directory, 'requirements.txt')) as f:
     install_requirements = f.read().splitlines()
@@ -15,13 +18,6 @@ with codecs.open(os.path.join(this_directory, 'README.rst'), encoding='utf-8') a
     long_description = f.read()
 
 
-test_requirements = [
-    "unittest2",
-    "coverage",
-    "six",
-]
-
-
 def test_discover():
     test_loader = unittest.TestLoader()
     test_suite = test_loader.discover('test', pattern='test_*.py')
@@ -29,23 +25,23 @@ def test_discover():
 
 
 setup(
-    name='cryptoparser',
-    version='0.9.0',
-    description='Fast and flexible security protocol parser and generator',
+    name=__setup__.__title__,
+    version=__setup__.__version__,
+    description=__setup__.__description__,
     long_description=long_description,
     long_description_content_type='text/x-rst',
-    author='Szilárd Pfeiffer',
-    author_email='coroner@pfeifferszilard.hu',
-    maintainer='Szilárd Pfeiffer',
-    maintainer_email='coroner@pfeifferszilard.hu',
-    license='MPL-2.0',
+    author=__setup__.__author__,
+    author_email=__setup__.__author_email__,
+    maintainer=__setup__.__author__,
+    maintainer_email=__setup__.__author_email__,
+    license=__setup__.__license__,
     license_files=['LICENSE.txt', ],
     project_urls={
-        'Homepage': 'https://gitlab.com/coroner/cryptoparser',
-        'Changelog': 'https://cryptoparser.readthedocs.io/en/latest/changelog',
-        'Documentation': 'https://cryptoparser.readthedocs.io/en/latest/',
-        'Issues': 'https://gitlab.com/coroner/cryptoparser/-/issues',
-        'Source': 'https://gitlab.com/coroner/cryptoparser',
+        'Homepage': __setup__.__url__,
+        'Changelog': 'https://' + __setup__.__technical_name__ + '.readthedocs.io/en/latest/changelog',
+        'Documentation': 'https://' + __setup__.__technical_name__ + '.readthedocs.io/en/latest/',
+        'Issues': __setup__.__url__ + '/-/issues',
+        'Source': __setup__.__url__,
     },
     keywords='ssl tls gost ja3 ldap rdp ssh hsts',
 
@@ -55,9 +51,9 @@ setup(
             "enum34==1.1.6",
             "pathlib2==2.3.7.post1",
             "Mock",
+            "unittest2",
         ],
-
-        "test": test_requirements,
+        "test": ["coverage", ],
         "pep8": ["flake8", ],
         "pylint": ["pylint", ],
     },

cryptoparser-0.9.0/cryptoparser/common/x509.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from cryptoparser.common.base import (
-    Opaque,
-    OpaqueParam,
-    VectorParamParsable,
-    VectorParsable,
-)
-
-
-class SerializedSCT(Opaque):
-    @classmethod
-    def get_param(cls):
-        return OpaqueParam(
-            min_byte_num=1,
-            max_byte_num=2 ** 16 - 1,
-        )
-
-
-class SignedCertificateTimestampList(VectorParsable):
-    @classmethod
-    def get_param(cls):
-        return VectorParamParsable(
-            item_class=SerializedSCT,
-            fallback_class=None,
-            min_byte_num=0, max_byte_num=2 ** 16 - 1
-        )