CryptoParser 1.1.0__tar.gz → 1.2.0__tar.gz

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/CHANGELOG.rst

@@ -2,6 +2,29 @@
 Changelog
 =========
 
+------------------
+1.2.0 - 2026-05-05
+------------------
+ 
+Features
+========
+
+-  IKE (``ike``)
+
+   -  add IKEv1 delete payload parsing (#92)
+   -  add IKEv1 certificate request payload parsing (#97)
+
+------------------
+1.1.1 - 2026-05-03
+------------------
+
+Notable fixes
+=============
+
+-  SSH
+
+   -  add missing key size property (#96)
+
 -------------------
 1.1.0 - 2026-02-13
 -------------------

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/CryptoParser.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.1.0
+Version: 1.2.0
 Summary: An analysis oriented security protocol parser and generator
 Author-email: Szilárd Pfeiffer <coroner@pfeifferszilard.hu>
 Maintainer-email: Szilárd Pfeiffer <coroner@pfeifferszilard.hu>
-License: MPL-2.0
+License-Expression: MPL-2.0
 Project-URL: Homepage, https://gitlab.com/coroner/cryptoparser
 Project-URL: Changelog, https://cryptoparser.readthedocs.io/en/latest/changelog
 Project-URL: Documentation, https://cryptoparser.readthedocs.io/en/latest/
@@ -40,7 +40,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs
-Requires-Dist: cryptodatahub==1.1.0
+Requires-Dist: cryptodatahub==1.2.0
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/CryptoParser.egg-info/requires.txt

@@ -1,6 +1,6 @@
 asn1crypto
 attrs
-cryptodatahub==1.1.0
+cryptodatahub==1.2.0
 urllib3
 
 [docs]

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.1.0
+Version: 1.2.0
 Summary: An analysis oriented security protocol parser and generator
 Author-email: Szilárd Pfeiffer <coroner@pfeifferszilard.hu>
 Maintainer-email: Szilárd Pfeiffer <coroner@pfeifferszilard.hu>
-License: MPL-2.0
+License-Expression: MPL-2.0
 Project-URL: Homepage, https://gitlab.com/coroner/cryptoparser
 Project-URL: Changelog, https://cryptoparser.readthedocs.io/en/latest/changelog
 Project-URL: Documentation, https://cryptoparser.readthedocs.io/en/latest/
@@ -40,7 +40,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs
-Requires-Dist: cryptodatahub==1.1.0
+Requires-Dist: cryptodatahub==1.2.0
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

cryptoparser-1.2.0/cryptoparser/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/__setup__.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import importlib.metadata

cryptoparser-1.2.0/cryptoparser/common/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/base.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/classes.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/exception.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import typing

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/field.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/parse.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/utils.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import binascii

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/common/x509.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import collections

cryptoparser-1.2.0/cryptoparser/dnsrec/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/dnsrec/record.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/dnsrec/txt.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

cryptoparser-1.2.0/cryptoparser/httpx/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/httpx/header.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # pylint: disable=too-many-lines
 # -*- coding: utf-8 -*-
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/httpx/parse.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 from cryptoparser.common.field import (

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/httpx/version.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import enum

cryptoparser-1.2.0/cryptoparser/ike/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ike/common.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 import abc
 import enum
 import typing

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ike/ikev1.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 """IKEv1 payload parsers."""
 
 import abc
@@ -587,7 +588,60 @@ class Ikev1PayloadHash(Ikev1PayloadBase):
 
 
 @attr.s
-class Ikev1PayloadNotification(Ikev1PayloadBase):
+class Ikev1PayloadDoiProtocolSpiBase(Ikev1PayloadBase):
+    """Base class for IKEv1 payloads with DOI, Protocol-Id, and SPI Size fields.
+
+    Shared structure:
+
+    .. code-block:: text
+
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |              Domain of Interpretation  (DOI)                  |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |  Protocol-Id  |   SPI Size    |                               |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    :ivar doi: Domain of Interpretation (4 bytes)
+    :ivar protocol_id: Protocol ID (1 byte)
+    :ivar spi_size: Size of SPI in bytes (1 byte)
+    """
+
+    DOI_PROTOCOL_SPI_SIZE = 6
+
+    doi: Ikev1Doi = attr.ib(validator=attr.validators.instance_of(Ikev1Doi))
+    protocol_id: Ikev1ProtocolId = attr.ib(validator=attr.validators.instance_of(Ikev1ProtocolId))
+    spi_size: int = attr.ib(validator=attr.validators.instance_of(int))
+
+    @classmethod
+    @abc.abstractmethod
+    def _parse(cls, parsable):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def compose(self):
+        raise NotImplementedError()
+
+    @classmethod
+    def _parse_header(cls, parsable):
+        parser = super()._parse_header(parsable)
+        if parser.unparsed_length < cls.DOI_PROTOCOL_SPI_SIZE:
+            raise NotEnoughData(cls.DOI_PROTOCOL_SPI_SIZE - parser.unparsed_length)
+
+        parser.parse_numeric_enum_coded('doi', Ikev1Doi)
+        parser.parse_numeric_enum_coded('protocol_id', Ikev1ProtocolId)
+        parser.parse_numeric('spi_size', 1)
+
+        return parser
+
+    def _compose_doi_protocol_spi(self, composer):
+        """Compose DOI, Protocol-Id, and SPI Size to composer."""
+        composer.compose_numeric_enum_coded(self.doi)
+        composer.compose_numeric_enum_coded(self.protocol_id)
+        composer.compose_numeric(self.spi_size, 1)
+
+
+@attr.s
+class Ikev1PayloadNotification(Ikev1PayloadDoiProtocolSpiBase):
     """Notification payload parser.
 
     The Notification payload has the following format:
@@ -612,17 +666,11 @@ class Ikev1PayloadNotification(Ikev1PayloadBase):
         !                                                               !
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
-    :ivar doi: Domain of Interpretation (4 bytes)
-    :ivar protocol_id: Protocol ID (1 byte)
-    :ivar spi_size: Size of SPI in bytes (1 byte)
     :ivar notify_message_type: Notify message type (1 byte)
     :ivar spi: Security Parameter Index (variable length)
     :ivar notification_data: Notification data (variable length)
     """
 
-    doi: Ikev1Doi = attr.ib(validator=attr.validators.instance_of(Ikev1Doi))
-    protocol_id: Ikev1ProtocolId = attr.ib(validator=attr.validators.instance_of(Ikev1ProtocolId))
-    spi_size: int = attr.ib(validator=attr.validators.instance_of(int))
     notify_type: Ikev1NotifyType = attr.ib(validator=attr.validators.instance_of(Ikev1NotifyType))
     spi: bytes = attr.ib(converter=bytes, validator=attr.validators.instance_of(bytes))
     notification_data: bytes = attr.ib(converter=bytes, validator=attr.validators.instance_of(bytes))
@@ -634,9 +682,6 @@ class Ikev1PayloadNotification(Ikev1PayloadBase):
     @classmethod
     def _parse(cls, parsable):
         parser = cls._parse_header(parsable)
-        parser.parse_numeric_enum_coded('doi', Ikev1Doi)
-        parser.parse_numeric_enum_coded('protocol_id', Ikev1ProtocolId)
-        parser.parse_numeric('spi_size', 1)
         parser.parse_numeric_enum_coded('notify_type', Ikev1NotifyType)
         parser.parse_raw('spi', parser['spi_size'])
         parser.parse_raw('notification_data', parser['payload_length'] - parser.parsed_length)
@@ -654,9 +699,7 @@ class Ikev1PayloadNotification(Ikev1PayloadBase):
 
     def compose(self):
         composer_payload = ComposerBinary()
-        composer_payload.compose_numeric_enum_coded(self.doi)
-        composer_payload.compose_numeric_enum_coded(self.protocol_id)
-        composer_payload.compose_numeric(len(self.spi), 1)
+        self._compose_doi_protocol_spi(composer_payload)
         composer_payload.compose_numeric_enum_coded(self.notify_type)
         composer_payload.compose_raw(self.spi)
         composer_payload.compose_raw(self.notification_data)
@@ -665,6 +708,74 @@ class Ikev1PayloadNotification(Ikev1PayloadBase):
         return composer_header.composed_bytes + composer_payload.composed_bytes
 
 
+@attr.s
+class Ikev1PayloadDelete(Ikev1PayloadDoiProtocolSpiBase):
+    """Delete payload parser.
+
+    The Delete payload has the following format:
+
+    .. code-block:: text
+
+                          1                   2                   3
+        0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       | Next Payload  |   RESERVED    |         Payload Length        |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |              Domain of Interpretation  (DOI)                  |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |  Protocol-Id  |   SPI Size    |           # of SPIs           |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |                                                               |
+       ~               Security Parameter Index(es) (SPI)              ~
+       |                                                               |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    :ivar spis: Security Parameter Index(es) (variable length, list of spi_size bytes each)
+    """
+
+    spis: typing.Sequence[typing.Union[bytes, bytearray]] = attr.ib(
+        validator=attr.validators.deep_iterable(
+            member_validator=attr.validators.instance_of((bytes, bytearray)),
+        )
+    )
+
+    @classmethod
+    def get_payload_type(cls):
+        return Ikev1PayloadType.DELETE
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = cls._parse_header(parsable)
+        parser.parse_numeric('spi_count', 2)
+
+        spis = []
+        for _ in range(parser['spi_count']):
+            parser.parse_raw('spi', parser['spi_size'])
+            spis.append(parser['spi'])
+
+        payload = cls(
+            doi=parser['doi'],
+            protocol_id=parser['protocol_id'],
+            spi_size=parser['spi_size'],
+            spis=spis,
+        )
+        payload.next_payload = parser['next_payload']
+
+        return payload, parser.parsed_length
+
+    def compose(self):
+        composer_payload = ComposerBinary()
+        self._compose_doi_protocol_spi(composer_payload)
+        composer_payload.compose_numeric(len(self.spis), 2)
+
+        for spi in self.spis:
+            composer_payload.compose_raw(spi)
+
+        composer_header = self.compose_header(composer_payload.composed_length)
+
+        return composer_header.composed_bytes + composer_payload.composed_bytes
+
+
 @attr.s
 class Ikev1PayloadVendorId(Ikev1PayloadBase):
     """Vendor ID payload parser.
@@ -712,13 +823,71 @@ class Ikev1PayloadVendorId(Ikev1PayloadBase):
         return composer_header.composed_bytes + composer_payload.composed_bytes
 
 
+@attr.s
+class Ikev1PayloadCertificateRequest(Ikev1PayloadBase):
+    """Certificate Request payload parser.
+
+    The Certificate Request payload has the following format:
+
+    .. code-block:: text
+
+        0                   1                   2                   3
+        0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        | Next Payload  |C|  RESERVED   |         Payload Length        |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        | Cert Encoding |                                               |
+        +-+-+-+-+-+-+-+-+                                               +
+        ~                       Certificate Data                        ~
+        |                                                               |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    :ivar cert_encoding: Certificate encoding type
+    :ivar certificate_data: Certificate data
+    """
+
+    cert_encoding: int = attr.ib(validator=attr.validators.instance_of(int))
+    certificate_data: typing.Union[bytes, bytearray] = attr.ib(
+        validator=attr.validators.instance_of((bytes, bytearray))
+    )
+
+    @classmethod
+    def get_payload_type(cls):
+        return Ikev1PayloadType.CERTIFICATE_REQUEST
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = cls._parse_header(parsable)
+        parser.parse_numeric('cert_encoding', 1)
+        parser.parse_raw('certificate_data', parser['payload_length'] - cls.HEADER_SIZE - 1)
+
+        payload = cls(
+            cert_encoding=parser['cert_encoding'],
+            certificate_data=parser['certificate_data']
+        )
+        payload.next_payload = parser['next_payload']
+
+        return payload, parser.parsed_length
+
+    def compose(self):
+        composer_payload = ComposerBinary()
+        composer_payload.compose_numeric(self.cert_encoding, 1)
+        composer_payload.compose_raw(self.certificate_data)
+
+        composer_header = self.compose_header(composer_payload.composed_length)
+
+        return composer_header.composed_bytes + composer_payload.composed_bytes
+
+
 IKEV1_PAYLOAD_CLASSES_BY_TYPE = {
     Ikev1PayloadType.SECURITY_ASSOCIATION: Ikev1PayloadSecurityAssociation,
     Ikev1PayloadType.KEY_EXCHANGE: Ikev1PayloadKeyExchange,
     Ikev1PayloadType.HASH: Ikev1PayloadHash,
     Ikev1PayloadType.NONCE: Ikev1PayloadNonce,
     Ikev1PayloadType.NOTIFICATION: Ikev1PayloadNotification,
+    Ikev1PayloadType.DELETE: Ikev1PayloadDelete,
     Ikev1PayloadType.VENDOR_ID: Ikev1PayloadVendorId,
+    Ikev1PayloadType.CERTIFICATE_REQUEST: Ikev1PayloadCertificateRequest,
 }
 
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ike/ikev2.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 """IKEv2 message parsers."""
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ike/isakmp.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 """ISAKMP header parser."""
 
 import enum

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ike/version.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 """ISAKMP version handling."""
 
 import abc

cryptoparser-1.2.0/cryptoparser/ssh/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ssh/key.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 
@@ -24,6 +25,7 @@ from cryptodatahub.common.key import (
     PublicKeyParamsEcdsa,
     PublicKeyParamsEddsa,
     PublicKeyParamsRsa,
+    PublicKeySize,
 )
 from cryptodatahub.common.utils import hash_bytes
 from cryptodatahub.ssh.algorithm import SshHostKeyAlgorithm, SshHostKeyType, SshEllipticCurveIdentifier
@@ -77,6 +79,10 @@ class SshPublicKeyBase():
 
         return ':'.join((prefix, fingerprint))
 
+    @property
+    def key_size(self):
+        return PublicKeySize(self.public_key.key_type, self.public_key.key_size)
+
     @property
     def fingerprints(self):
         key_bytes = self.key_bytes

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ssh/record.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ssh/subprotocol.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/ssh/version.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

cryptoparser-1.2.0/cryptoparser/tls/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/algorithm.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/ciphersuite.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/extension.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/grease.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/ldap.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/mysql.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/openvpn.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/postgresql.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import attr

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/rdp.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/record.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import attr

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/subprotocol.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/cryptoparser/tls/version.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/docs/conf.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 # pylint: disable=invalid-name
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'CryptoParser'
-version = '1.1.0'
+version = '1.2.0'
 description = 'An analysis oriented security protocol parser and generator'
 authors = [
     {name = 'Szilárd Pfeiffer', email = 'coroner@pfeifferszilard.hu'}
@@ -42,12 +42,13 @@ classifiers=[
 
 keywords=['ssl', 'tls', 'gost', 'ja3', 'ldap', 'rdp', 'ssh', 'hsts', 'dns', 'ike']
 readme = {file = 'README.rst', content-type = 'text/x-rst'}
-license = {text = 'MPL-2.0'}
+license = 'MPL-2.0'
+license-files = ['LICENSE.txt']
 
 dependencies = [
     'asn1crypto',
     'attrs',
-    'cryptodatahub==1.1.0',
+    'cryptodatahub==1.2.0',
     'urllib3',
 ]
 

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: MPL-2.0
 
 import setuptools
 

cryptoparser-1.2.0/test/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

cryptoparser-1.2.0/test/common/__init__.py

@@ -0,0 +1 @@
+# SPDX-License-Identifier: MPL-2.0

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/test/common/classes.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import abc

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/test/common/test_algorithm.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import unittest

{cryptoparser-1.1.0 → cryptoparser-1.2.0}/test/common/test_base.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: MPL-2.0
 # -*- coding: utf-8 -*-
 
 import json