cryptoparser 0.12.2__tar.gz → 0.12.4__tar.gz

{CryptoParser-0.12.2 → cryptoparser-0.12.4}/CHANGELOG.rst

@@ -2,6 +2,28 @@
 Changelog
 =========
 
+------
+0.12.4
+------
+
+Notable fixes
+=============
+
+-  DNS
+
+   -  handle TXT records that contain multiple string (#84)
+
+-------------------
+0.12.3 - 2024-03-05
+-------------------
+
+Notable fixes
+=============
+
+-  DNS
+
+   -  handle private values of RRSIG type (#83)
+
 -------------------
 0.12.2 - 2024-01-11
 -------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CryptoParser
-Version: 0.12.2
+Version: 0.12.4
 Summary: An analysis oriented security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
@@ -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.12.2
+Requires-Dist: cryptodatahub==0.12.4
 Requires-Dist: python-dateutil
 Requires-Dist: py2-ipaddress; python_version < "3.4"
 Requires-Dist: typing; python_version < "3.5"

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CryptoParser
-Version: 0.12.2
+Version: 0.12.4
 Summary: An analysis oriented security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
@@ -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.12.2
+Requires-Dist: cryptodatahub==0.12.4
 Requires-Dist: python-dateutil
 Requires-Dist: py2-ipaddress; python_version < "3.4"
 Requires-Dist: typing; python_version < "3.5"

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

@@ -2,7 +2,7 @@
 
 __title__ = 'CryptoParser'
 __technical_name__ = __title__.lower()
-__version__ = '0.12.2'
+__version__ = '0.12.4'
 __description__ = 'An analysis oriented security protocol parser and generator'
 __author__ = 'Szilárd Pfeiffer'
 __author_email__ = 'coroner@pfeifferszilard.hu'

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

@@ -1044,3 +1044,52 @@ class OpaqueEnumComposer(enum.Enum):
     @classmethod
     def get_encoding(cls):
         return 'utf-8'
+
+
+@attr.s
+class NumericRangeParsableBase(ParsableBase, Serializable):
+    value = attr.ib(validator=attr.validators.instance_of(six.integer_types))
+
+    @value.validator
+    def _validator_variant(self, _, value):
+        if value < self._get_value_min():
+            raise InvalidValue(value, type(self))
+
+        if value > self._get_value_max():
+            raise InvalidValue(value, type(self))
+
+    @classmethod
+    @abc.abstractmethod
+    def _get_value_min(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    @abc.abstractmethod
+    def _get_value_max(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    @abc.abstractmethod
+    def _get_value_length(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = ParserBinary(parsable)
+
+        parser.parse_numeric('value', cls._get_value_length())
+
+        return cls(**parser), parser.parsed_length
+
+    def compose(self):
+        composer = ComposerBinary()
+
+        composer.compose_numeric(self.value, self._get_value_length())
+
+        return composer.composed
+
+    def __str__(self):
+        return str(self.value)
+
+    def _as_markdown(self, level):
+        return self._markdown_result(str(self), level)

{CryptoParser-0.12.2 → cryptoparser-0.12.4}/cryptoparser/dnsrec/record.py

@@ -20,7 +20,7 @@ from cryptodatahub.common.key import (
 
 from cryptodatahub.dnsrec.algorithm import DnsRrType, DnsSecAlgorithm, DnsSecDigestType
 
-from cryptoparser.common.base import OneByteEnumParsable, Serializable, TwoByteEnumParsable
+from cryptoparser.common.base import NumericRangeParsableBase, OneByteEnumParsable, Serializable, TwoByteEnumParsable
 from cryptoparser.common.exception import NotEnoughData
 from cryptoparser.common.parse import ByteOrder, ComposerBinary, ParsableBase, ParserBinary
 
@@ -318,6 +318,20 @@ class DnsRrTypeFactory(TwoByteEnumParsable):
         raise NotImplementedError()
 
 
+class DnsRrTypePrivate(NumericRangeParsableBase):
+    @classmethod
+    def _get_value_min(cls):
+        return 0xff00
+
+    @classmethod
+    def _get_value_max(cls):
+        return 0xfffe
+
+    @classmethod
+    def _get_value_length(cls):
+        return 2
+
+
 @attr.s
 class DnsNameUncompressed(ParsableBase, Serializable):
     labels = attr.ib(
@@ -373,7 +387,7 @@ class DnsNameUncompressed(ParsableBase, Serializable):
 class DnsRecordRrsig(ParsableBase):  # pylint: disable=too-many-instance-attributes
     HEADER_SIZE = 24
 
-    type_covered = attr.ib(validator=attr.validators.instance_of(DnsRrType))
+    type_covered = attr.ib(validator=attr.validators.instance_of((DnsRrType, DnsRrTypePrivate)))
     algorithm = attr.ib(validator=attr.validators.instance_of(DnsSecAlgorithm))
     labels = attr.ib(validator=attr.validators.instance_of(six.integer_types))
     original_ttl = attr.ib(
@@ -387,7 +401,10 @@ class DnsRecordRrsig(ParsableBase):  # pylint: disable=too-many-instance-attribu
         converter=DnsNameUncompressed.convert,
         validator=attr.validators.instance_of(DnsNameUncompressed)
     )
-    signature = attr.ib(validator=attr.validators.instance_of((bytes, bytearray)))
+    signature = attr.ib(
+        validator=attr.validators.instance_of((bytes, bytearray)),
+        metadata={'human_friendly': False}
+    )
 
     @classmethod
     def _parse(cls, parsable):
@@ -396,7 +413,10 @@ class DnsRecordRrsig(ParsableBase):  # pylint: disable=too-many-instance-attribu
 
         parser = ParserBinary(parsable)
 
-        parser.parse_parsable('type_covered', DnsRrTypeFactory)
+        try:
+            parser.parse_parsable('type_covered', DnsRrTypeFactory)
+        except InvalidValue:
+            parser.parse_parsable('type_covered', DnsRrTypePrivate)
         parser.parse_parsable('algorithm', DnsSecAlgorithmFactory)
         parser.parse_numeric('labels', 1)
         parser.parse_numeric('original_ttl', 4)
@@ -411,7 +431,10 @@ class DnsRecordRrsig(ParsableBase):  # pylint: disable=too-many-instance-attribu
     def compose(self):
         composer = ComposerBinary()
 
-        composer.compose_numeric_enum_coded(self.type_covered)
+        if isinstance(self.type_covered, DnsRrType):
+            composer.compose_numeric_enum_coded(self.type_covered)
+        else:
+            composer.compose_parsable(self.type_covered)
         composer.compose_numeric_enum_coded(self.algorithm)
         composer.compose_numeric(self.labels, 1)
         composer.compose_numeric(self.original_ttl, 4)
@@ -467,10 +490,13 @@ class DnsRecordTxt(ParsableBase):
             raise NotEnoughData(cls.HEADER_SIZE - len(parsable))
 
         parser = ParserBinary(parsable)
+        value = ''
 
-        parser.parse_string('value', 1, encoding='ascii')
+        while parser.unparsed_length:
+            parser.parse_string('value', 1, encoding='ascii')
+            value += parser['value']
 
-        return cls(**parser), parser.parsed_length
+        return cls(value), parser.parsed_length
 
     def compose(self):
         composer = ComposerBinary()

{CryptoParser-0.12.2 → cryptoparser-0.12.4}/requirements.txt

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