CryptoParser 1.0.2__tar.gz → 1.1.1__tar.gz

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/CHANGELOG.rst

@@ -2,6 +2,30 @@
 Changelog
 =========
 
+------------------
+1.1.1 - 2026-05-03
+------------------
+
+Notable fixes
+=============
+
+-  SSH
+
+   -  add missing key size property (#96)
+
+-------------------
+1.1.0 - 2026-02-13
+-------------------
+
+Features
+========
+
+-  IKE (``ike``)
+
+   -  add ISAKMP header parsing (#91)
+   -  add parser/composer for mandatory IKEv2 protocol elements (#91)
+   -  add parser/composer for mandatory IKEv1 protocol elements (#91)
+
 -------------------
 1.0.2 - 2025-12-30
 -------------------
@@ -33,7 +57,7 @@ Refactor
 
 -  Generic
 
-   -  Support only Python version greater or euqal than 3.9
+   -  Support only Python version greater than or equal to 3.9
    -  Use pyproject.toml instead of setup.py
 
 -------------------

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/CryptoParser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.0.2
+Version: 1.1.1
 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>
@@ -10,7 +10,7 @@ Project-URL: Changelog, https://cryptoparser.readthedocs.io/en/latest/changelog
 Project-URL: Documentation, https://cryptoparser.readthedocs.io/en/latest/
 Project-URL: Issues, https://gitlab.com/coroner/cryptoparser/-/issues
 Project-URL: Source, https://gitlab.com/coroner/cryptoparser
-Keywords: ssl,tls,gost,ja3,ldap,rdp,ssh,hsts,dns
+Keywords: ssl,tls,gost,ja3,ldap,rdp,ssh,hsts,dns,ike
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: tox
@@ -40,7 +40,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs
-Requires-Dist: cryptodatahub==1.0.2
+Requires-Dist: cryptodatahub==1.1.1
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/CryptoParser.egg-info/SOURCES.txt

@@ -34,6 +34,12 @@ cryptoparser/httpx/__init__.py
 cryptoparser/httpx/header.py
 cryptoparser/httpx/parse.py
 cryptoparser/httpx/version.py
+cryptoparser/ike/__init__.py
+cryptoparser/ike/common.py
+cryptoparser/ike/ikev1.py
+cryptoparser/ike/ikev2.py
+cryptoparser/ike/isakmp.py
+cryptoparser/ike/version.py
 cryptoparser/ssh/__init__.py
 cryptoparser/ssh/key.py
 cryptoparser/ssh/record.py
@@ -81,6 +87,15 @@ test/httpx/__init__.py
 test/httpx/classes.py
 test/httpx/test_header.py
 test/httpx/test_version.py
+test/ike/__init__.py
+test/ike/classes.py
+test/ike/test_ikev1_payload.py
+test/ike/test_ikev1_sa.py
+test/ike/test_ikev2_notify.py
+test/ike/test_ikev2_payload.py
+test/ike/test_ikev2_sa.py
+test/ike/test_isakmp.py
+test/ike/test_version.py
 test/ssh/__init__.py
 test/ssh/test_ciphersuites.py
 test/ssh/test_key.py

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/CryptoParser.egg-info/requires.txt

@@ -1,6 +1,6 @@
 asn1crypto
 attrs
-cryptodatahub==1.0.2
+cryptodatahub==1.1.1
 urllib3
 
 [docs]

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/CryptoParser.egg-info/top_level.txt

@@ -1,3 +1,4 @@
+build
 cryptoparser
 dist
 docs

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.0.2
+Version: 1.1.1
 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>
@@ -10,7 +10,7 @@ Project-URL: Changelog, https://cryptoparser.readthedocs.io/en/latest/changelog
 Project-URL: Documentation, https://cryptoparser.readthedocs.io/en/latest/
 Project-URL: Issues, https://gitlab.com/coroner/cryptoparser/-/issues
 Project-URL: Source, https://gitlab.com/coroner/cryptoparser
-Keywords: ssl,tls,gost,ja3,ldap,rdp,ssh,hsts,dns
+Keywords: ssl,tls,gost,ja3,ldap,rdp,ssh,hsts,dns,ike
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: tox
@@ -40,7 +40,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs
-Requires-Dist: cryptodatahub==1.0.2
+Requires-Dist: cryptodatahub==1.1.1
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/cryptoparser/common/exception.py

@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
 
+import typing
+
 import attr
 
 
 @attr.s
 class InvalidDataLength(Exception):
-    bytes_needed = attr.ib(default=None, validator=attr.validators.optional(attr.validators.instance_of(int)))
+    bytes_needed: typing.Optional[int] = attr.ib(
+        default=None,
+        validator=attr.validators.optional(attr.validators.instance_of(int))
+    )
 
 
 @attr.s

{cryptoparser-1.0.2 → cryptoparser-1.1.1}/cryptoparser/common/parse.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=too-many-lines
 
 import abc
 import collections.abc
@@ -6,6 +7,7 @@ import datetime
 import enum
 import struct
 import time
+import typing
 
 import attr
 
@@ -88,9 +90,12 @@ class ByteOrder(enum.Enum):
 
 @attr.s
 class ParserBase(collections.abc.Mapping):
-    _parsable = attr.ib(converter=bytes, validator=attr.validators.instance_of((bytes, bytearray)))
-    _parsed_length = attr.ib(init=False, default=0)
-    _parsed_values = attr.ib(init=False, default=None)
+    _parsable: typing.Union[bytes, bytearray] = attr.ib(
+        converter=bytes,
+        validator=attr.validators.instance_of((bytes, bytearray))
+    )
+    _parsed_length: int = attr.ib(init=False, default=0)
+    _parsed_values: typing.Dict[str, typing.Any] = attr.ib(init=False, default=None)
 
     def __attrs_post_init__(self):
         if self._parsed_values is None:
@@ -279,6 +284,7 @@ class ParserText(ParserBase):
                 name, min_length, max_length, self._encoding, str
             )
         except NotEnoughData as e:
+            assert e.bytes_needed is not None
             raise InvalidValue(self._parsable[self._parsed_length:min_length - e.bytes_needed], type(self), name) from e
 
         if value != actual_value:
@@ -489,7 +495,7 @@ class ParserText(ParserBase):
 
 @attr.s
 class ParserBinary(ParserBase):
-    byte_order = attr.ib(default=ByteOrder.NETWORK, validator=attr.validators.in_(ByteOrder))
+    byte_order: ByteOrder = attr.ib(default=ByteOrder.NETWORK, validator=attr.validators.in_(ByteOrder))
 
     def parse_timestamp(self, name, milliseconds=False, item_size=8):
         value, parsed_length = self._parse_numeric_array(name, 1, item_size, int)
@@ -543,6 +549,13 @@ class ParserBinary(ParserBase):
         self._parsed_length += parsed_length
         self._parsed_values[name] = value[0]
 
+    def parse_numeric_enum_coded(self, name, enum_class):
+        param = list(enum_class)[0].value
+        value, parsed_length = self._parse_numeric_array(name, 1, param.get_code_size(), enum_class.from_code)
+
+        self._parsed_length += parsed_length
+        self._parsed_values[name] = value[0]
+
     def parse_numeric_array(self, name, item_num, item_size, converter=int):
         value, parsed_length = self._parse_numeric_array(name, item_num, item_size, converter)
 
@@ -840,7 +853,7 @@ class ComposerText(ComposerBase):
 
 @attr.s
 class ComposerBinary(ComposerBase):
-    byte_order = attr.ib(default=ByteOrder.NETWORK, validator=attr.validators.in_(ByteOrder))
+    byte_order: ByteOrder = attr.ib(default=ByteOrder.NETWORK, validator=attr.validators.in_(ByteOrder))
 
     def compose_timestamp(self, value, milliseconds=False, item_size=8):
         if value is None:

cryptoparser-1.1.1/cryptoparser/ike/common.py

@@ -0,0 +1,235 @@
+import abc
+import enum
+import typing
+
+import attr
+
+from cryptodatahub.common.exception import InvalidValue
+
+from cryptoparser.common.exception import InvalidType
+from cryptoparser.common.parse import ParsableBase, ParserBinary, ComposerBinary
+
+
+@attr.s
+class DataAttributeBase(ParsableBase):
+    """Data attribute base parser.
+
+    .. 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
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         !A!       Attribute Type        !    AF=0  Attribute Length     !
+         !F!                             !    AF=1  Attribute Value      !
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         .                   AF=0  Attribute Value                       .
+         .                   AF=1  Not Transmitted                       .
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    """
+
+    @classmethod
+    @abc.abstractmethod
+    def _parse(cls, parsable):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def compose(self):
+        raise NotImplementedError()
+
+    @classmethod
+    @abc.abstractmethod
+    def get_type(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _get_format(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _parse_header(cls, parsable):
+        parser = ParserBinary(parsable)
+
+        parser.parse_numeric('format', 1, DataAttributeFormat)
+        if parser['format'] != cls._get_format():
+            raise InvalidType()
+
+        parser.parse_numeric_enum_coded('type', type(cls.get_type()))
+        if parser['type'] != cls.get_type():
+            raise InvalidType()
+
+        return parser
+
+    def _compose_header(self):
+        composer = ComposerBinary()
+
+        composer.compose_numeric(self._get_format().value, 1)
+        composer.compose_numeric_enum_coded(self.get_type())
+
+        return composer
+
+
+class DataAttributeFormat(enum.IntEnum):
+    """Data attribute types."""
+    TYPE_LENGTH_VALUE = 0x00
+    TYPE_VALUE = 0x80
+
+
+@attr.s
+class DataAttributeTypeValue(DataAttributeBase):
+    """Data attribute type/value parser."""
+
+    @classmethod
+    @abc.abstractmethod
+    def get_type(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    @abc.abstractmethod
+    def _parse(cls, parsable):
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def compose(self):
+        raise NotImplementedError()
+
+    @classmethod
+    def _get_format(cls):
+        return DataAttributeFormat.TYPE_VALUE
+
+
+@attr.s
+class DataAttributeTypeValueEnumCoded(DataAttributeTypeValue):
+    """Data attribute type/value parser where the type is an enum."""
+
+    value: typing.Any = attr.ib()
+
+    @classmethod
+    @abc.abstractmethod
+    def get_type(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    @abc.abstractmethod
+    def _get_enum_type(cls):
+        raise NotImplementedError()
+
+    @value.validator
+    def _validate_value(self, _, value):
+        enum_type = self._get_enum_type()
+        if not isinstance(value, enum_type):
+            raise InvalidValue(value, type(self), 'value')
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = cls._parse_header(parsable)
+
+        parser.parse_numeric_enum_coded('value', cls._get_enum_type())
+
+        return cls(value=parser['value']), parser.parsed_length
+
+    def compose(self):
+        composer = self._compose_header()
+
+        composer.compose_numeric_enum_coded(self.value)
+
+        return composer.composed_bytes
+
+
+@attr.s
+class DataAttributeKeyLength(DataAttributeTypeValue):
+    """Key Length transform attribute (TV format).
+
+    The Key Length attribute has the following format:
+
+    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
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |A|       Attribute Type        |    Key Length (in bits)       |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    :ivar key_length: Key length in bits
+    """
+
+    value: int = attr.ib(validator=attr.validators.and_(
+        attr.validators.instance_of(int),
+        attr.validators.ge(0),
+        attr.validators.lt(2**64)
+    ))
+
+    @classmethod
+    @abc.abstractmethod
+    def get_type(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = cls._parse_header(parsable)
+        parser.parse_numeric('value', 2)
+
+        return cls(value=parser['value']), parser.parsed_length
+
+    def compose(self):
+        composer = self._compose_header()
+
+        composer.compose_numeric(self.value, 2)
+
+        return composer.composed_bytes
+
+
+@attr.s
+class DataAttributeLength(DataAttributeBase):
+    """Length transform attribute (TLV format).
+
+    The Key Length attribute has the following format:
+
+    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
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |A|       Attribute Type        |    Key Length (in bits)       |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    :ivar key_length: Key length in bits
+    """
+
+    value: int = attr.ib(validator=attr.validators.and_(
+        attr.validators.instance_of(int),
+        attr.validators.ge(0),
+        attr.validators.lt(2**64)
+    ))
+
+    @classmethod
+    @abc.abstractmethod
+    def get_type(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    @abc.abstractmethod
+    def _get_size(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _get_format(cls):
+        return DataAttributeFormat.TYPE_VALUE
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = cls._parse_header(parsable)
+
+        if parser['format'] == DataAttributeFormat.TYPE_LENGTH_VALUE:
+            parser.parse_numeric('size', 2)
+            parser.parse_numeric('value', parser['size'])
+        else:
+            parser.parse_numeric('value', cls._get_size())
+
+        return cls(value=parser['value']), parser.parsed_length
+
+    def compose(self):
+        composer = self._compose_header()
+
+        if self._get_format() == DataAttributeFormat.TYPE_LENGTH_VALUE:
+            composer.compose_numeric(self._get_size(), 2)
+            composer.compose_numeric(self.value, self._get_size())
+        else:
+            composer.compose_numeric(self.value, self._get_size())
+
+        return composer.composed_bytes