CryptoParser 1.2.0__tar.gz → 1.2.1__tar.gz

{cryptoparser-1.2.0 → cryptoparser-1.2.1}/.gitlab-ci.yml

@@ -86,7 +86,7 @@ coveralls:
 
 obs:
   image:
-    name: coroner/python_obs:1.0.0
+    name: coroner/python_obs:1.1.2
     pull_policy: always
   stage: deploy
   variables:

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

@@ -2,6 +2,17 @@
 Changelog
 =========
 
+------------------
+1.2.1 - 2026-06-02
+------------------
+
+Features
+========
+
+-  DNS (``dnsrec``)
+
+   -  add SSHFP DNS resource record parsing (#98)
+
 ------------------
 1.2.0 - 2026-05-05
 ------------------

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.2.0
+Version: 1.2.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>
-License-Expression: MPL-2.0
+License: 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.2.0
+Requires-Dist: cryptodatahub==1.2.1
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

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

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

{cryptoparser-1.2.0 → cryptoparser-1.2.1}/CryptoParser.egg-info/top_level.txt

@@ -1,7 +1,5 @@
-build
 cryptoparser
 dist
 docs
-htmlcov
 submodules
 test

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.2.0
+Version: 1.2.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>
-License-Expression: MPL-2.0
+License: 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.2.0
+Requires-Dist: cryptodatahub==1.2.1
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

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

@@ -12,4 +12,4 @@ __description__ = metadata['Summary']
 __author__ = metadata['Author']
 __author_email__ = metadata['Author-email']
 __url__ = 'https://gitlab.com/coroner/' + __technical_name__
-__license__ = metadata['License']
+__license__ = metadata.get('License-Expression') or metadata['License']

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

@@ -55,7 +55,7 @@ class SignedCertificateTimestamp(ParsableBase, Serializable):
     )
     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))
+        validator=attr.validators.instance_of(CtExtensions)
     )
     signature_algorithm = attr.ib(validator=attr.validators.in_(TlsSignatureAndHashAlgorithm))
     signature = attr.ib(

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

@@ -18,7 +18,13 @@ from cryptodatahub.common.key import (
     PublicKeyParamsRsa,
 )
 
-from cryptodatahub.dnsrec.algorithm import DnsRrType, DnsSecAlgorithm, DnsSecDigestType
+from cryptodatahub.dnsrec.algorithm import (
+    DnsRrType,
+    DnsSecAlgorithm,
+    DnsSecDigestType,
+    SshFpAlgorithm,
+    SshFpFingerprintType,
+)
 
 from cryptoparser.common.base import NumericRangeParsableBase, OneByteEnumParsable, Serializable, TwoByteEnumParsable
 from cryptoparser.common.exception import NotEnoughData
@@ -478,6 +484,56 @@ class DnsRecordMx(ParsableBase):
         return composer.composed_bytes
 
 
+class SshFpAlgorithmFactory(OneByteEnumParsable):
+    @classmethod
+    def get_enum_class(cls):
+        return SshFpAlgorithm
+
+    @abc.abstractmethod
+    def compose(self):
+        raise NotImplementedError()
+
+
+class SshFpFingerprintTypeFactory(OneByteEnumParsable):
+    @classmethod
+    def get_enum_class(cls):
+        return SshFpFingerprintType
+
+    @abc.abstractmethod
+    def compose(self):
+        raise NotImplementedError()
+
+
+@attr.s
+class DnsRecordSshfp(ParsableBase, Serializable):
+    HEADER_SIZE = 2
+
+    algorithm = attr.ib(validator=attr.validators.instance_of(SshFpAlgorithm))
+    fingerprint_type = attr.ib(validator=attr.validators.instance_of(SshFpFingerprintType))
+    fingerprint = attr.ib(validator=attr.validators.instance_of((bytes, bytearray)))
+
+    @classmethod
+    def _parse(cls, parsable):
+        if len(parsable) < cls.HEADER_SIZE:
+            raise NotEnoughData(cls.HEADER_SIZE - len(parsable))
+
+        parser = ParserBinary(parsable)
+        parser.parse_parsable('algorithm', SshFpAlgorithmFactory)
+        parser.parse_parsable('fingerprint_type', SshFpFingerprintTypeFactory)
+        parser.parse_raw('fingerprint', parser.unparsed_length)
+
+        return cls(**parser), parser.parsed_length
+
+    def compose(self):
+        composer = ComposerBinary()
+
+        composer.compose_numeric_enum_coded(self.algorithm)
+        composer.compose_numeric_enum_coded(self.fingerprint_type)
+        composer.compose_raw(self.fingerprint)
+
+        return composer.composed_bytes
+
+
 @attr.s
 class DnsRecordTxt(ParsableBase):
     HEADER_SIZE = 1

{cryptoparser-1.2.0 → cryptoparser-1.2.1}/docs/features.rst

@@ -105,6 +105,7 @@ Only features that cannot be or difficultly implemented by some of the most popu
    1. supports each cipher suites discussed on `ciphersuite.info <https://ciphersuite.info>`__
    2. supports `GOST <https://en.wikipedia.org/wiki/GOST>`__ (national standards of the Russian Federation and CIS
       countries) cipher suites
+   3. supports `ShangMi (SM) <https://www.rfc-editor.org/rfc/rfc8998>`__ (national standards of China) cipher suites
 
 -  application layer
 
@@ -142,3 +143,5 @@ Domain Name System (DNS)
    -  `DNSKEY <https://www.rfc-editor.org/rfc/rfc4034#section-2>`__
    -  `DS <https://www.rfc-editor.org/rfc/rfc4034#section-5>`__
    -  `RRSIG <https://www.rfc-editor.org/rfc/rfc4034#section-3>`__
+
+-  `SSHFP <https://www.rfc-editor.org/rfc/rfc4255>`__ (SSH host key fingerprints)

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

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

{cryptoparser-1.2.0 → cryptoparser-1.2.1}/test/dnsrec/test_record.py

@@ -16,7 +16,13 @@ from cryptodatahub.common.key import (
     PublicKeyParamsRsa,
 )
 
-from cryptodatahub.dnsrec.algorithm import DnsSecAlgorithm, DnsSecDigestType, DnsRrType
+from cryptodatahub.dnsrec.algorithm import (
+    DnsSecAlgorithm,
+    DnsSecDigestType,
+    DnsRrType,
+    SshFpAlgorithm,
+    SshFpFingerprintType,
+)
 
 from cryptoparser.common.exception import NotEnoughData
 from cryptoparser.dnsrec.record import (
@@ -25,6 +31,7 @@ from cryptoparser.dnsrec.record import (
     DnsRecordDs,
     DnsRecordMx,
     DnsRecordRrsig,
+    DnsRecordSshfp,
     DnsRecordTxt,
     DnsRrTypePrivate,
     DnsSecFlag,
@@ -549,3 +556,51 @@ class TestDnsRecordTxt(unittest.TestCase):
 
     def test_compose(self):
         self.assertEqual(self.record_single.compose(), self.record_bytes_single)
+
+
+class TestDnsRecordSshfp(unittest.TestCase):
+    def setUp(self):
+        self.record_rsa_sha1_bytes = bytes(
+            b'\x01' +          # algorithm: RSA
+            b'\x01' +          # fingerprint type: SHA-1
+            b'\xde\xad\xbe\xef' * 5  # fingerprint: 20 bytes
+        )
+        self.record_rsa_sha1 = DnsRecordSshfp(
+            algorithm=SshFpAlgorithm.RSA,
+            fingerprint_type=SshFpFingerprintType.SHA1,
+            fingerprint=b'\xde\xad\xbe\xef' * 5,
+        )
+
+        self.record_ecdsa_sha256_bytes = bytes(
+            b'\x03' +          # algorithm: ECDSA
+            b'\x02' +          # fingerprint type: SHA-256
+            b'\xab\xcd\xef\x01' * 8  # fingerprint: 32 bytes
+        )
+        self.record_ecdsa_sha256 = DnsRecordSshfp(
+            algorithm=SshFpAlgorithm.ECDSA,
+            fingerprint_type=SshFpFingerprintType.SHA2_256,
+            fingerprint=b'\xab\xcd\xef\x01' * 8,
+        )
+
+    def test_error_not_enough_data(self):
+        with self.assertRaises(NotEnoughData) as context_manager:
+            DnsRecordSshfp.parse_exact_size(b'\x01')
+
+        self.assertEqual(
+            context_manager.exception.bytes_needed,
+            DnsRecordSshfp.HEADER_SIZE - 1
+        )
+
+    def test_parse(self):
+        self.assertEqual(
+            DnsRecordSshfp.parse_exact_size(self.record_rsa_sha1_bytes),
+            self.record_rsa_sha1
+        )
+        self.assertEqual(
+            DnsRecordSshfp.parse_exact_size(self.record_ecdsa_sha256_bytes),
+            self.record_ecdsa_sha256
+        )
+
+    def test_compose(self):
+        self.assertEqual(self.record_rsa_sha1.compose(), self.record_rsa_sha1_bytes)
+        self.assertEqual(self.record_ecdsa_sha256.compose(), self.record_ecdsa_sha256_bytes)