cryptoparser 1.0.1__tar.gz → 1.0.2__tar.gz

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

@@ -2,6 +2,17 @@
 Changelog
 =========
 
+-------------------
+1.0.2 - 2025-12-30
+-------------------
+
+Notable fixes
+=============
+
+-  Generic
+
+   -  Purge submodules directory from distribution (#90)
+
 -------------------
 1.0.1 - 2025-12-07
 -------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.0.1
+Version: 1.0.2
 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>
@@ -17,7 +17,6 @@ Classifier: Framework :: tox
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
@@ -41,7 +40,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs
-Requires-Dist: cryptodatahub==1.0.1
+Requires-Dist: cryptodatahub==1.0.2
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

cryptoparser-1.0.2/CryptoParser.egg-info/SOURCES.txt

@@ -0,0 +1,105 @@
+.coveragerc
+.flake8
+.gitignore
+.gitlab-ci.yml
+.gitmodules
+.pylintrc
+.readthedocs.yaml
+CHANGELOG.rst
+CONTRIBUTING.rst
+LICENSE.txt
+MANIFEST.in
+README.rst
+pyproject.toml
+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/__setup__.py
+cryptoparser/common/__init__.py
+cryptoparser/common/base.py
+cryptoparser/common/classes.py
+cryptoparser/common/exception.py
+cryptoparser/common/field.py
+cryptoparser/common/parse.py
+cryptoparser/common/utils.py
+cryptoparser/common/x509.py
+cryptoparser/dnsrec/__init__.py
+cryptoparser/dnsrec/record.py
+cryptoparser/dnsrec/txt.py
+cryptoparser/httpx/__init__.py
+cryptoparser/httpx/header.py
+cryptoparser/httpx/parse.py
+cryptoparser/httpx/version.py
+cryptoparser/ssh/__init__.py
+cryptoparser/ssh/key.py
+cryptoparser/ssh/record.py
+cryptoparser/ssh/subprotocol.py
+cryptoparser/ssh/version.py
+cryptoparser/tls/__init__.py
+cryptoparser/tls/algorithm.py
+cryptoparser/tls/ciphersuite.py
+cryptoparser/tls/extension.py
+cryptoparser/tls/grease.py
+cryptoparser/tls/ldap.py
+cryptoparser/tls/mysql.py
+cryptoparser/tls/openvpn.py
+cryptoparser/tls/postgresql.py
+cryptoparser/tls/rdp.py
+cryptoparser/tls/record.py
+cryptoparser/tls/subprotocol.py
+cryptoparser/tls/version.py
+docs/.gitignore
+docs/changelog.rst
+docs/conf.py
+docs/development.rst
+docs/features.rst
+docs/index.rst
+test/__init__.py
+test/common/__init__.py
+test/common/classes.py
+test/common/test_algorithm.py
+test/common/test_base.py
+test/common/test_classes.py
+test/common/test_exception.py
+test/common/test_field.py
+test/common/test_parse.py
+test/common/test_utils.py
+test/common/test_x509.py
+test/common/certs/ecc256.badssl.com.pem
+test/common/certs/rsa8192.badssl.com.pem
+test/common/certs/rsa8192.badssl.com_certificate.crt
+test/common/certs/rsa8192.badssl.com_root_ca.crt
+test/common/certs/snakeoil_cert.pem
+test/dnsrec/__init__.py
+test/dnsrec/test_record.py
+test/dnsrec/test_txt.py
+test/httpx/__init__.py
+test/httpx/classes.py
+test/httpx/test_header.py
+test/httpx/test_version.py
+test/ssh/__init__.py
+test/ssh/test_ciphersuites.py
+test/ssh/test_key.py
+test/ssh/test_record.py
+test/ssh/test_subprotocol.py
+test/ssh/test_version.py
+test/tls/__init__.py
+test/tls/classes.py
+test/tls/test_alert.py
+test/tls/test_application_data.py
+test/tls/test_change_cipher_spec.py
+test/tls/test_ciphersuite.py
+test/tls/test_extension.py
+test/tls/test_grease.py
+test/tls/test_handshake.py
+test/tls/test_ldap.py
+test/tls/test_mysql.py
+test/tls/test_openvpn.py
+test/tls/test_postgresql.py
+test/tls/test_rdp.py
+test/tls/test_record.py
+test/tls/test_version.py

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

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

cryptoparser-1.0.2/MANIFEST.in

@@ -0,0 +1,2 @@
+include *.rst
+prune submodules

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CryptoParser
-Version: 1.0.1
+Version: 1.0.2
 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>
@@ -17,7 +17,6 @@ Classifier: Framework :: tox
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
@@ -41,7 +40,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs
-Requires-Dist: cryptodatahub==1.0.1
+Requires-Dist: cryptodatahub==1.0.2
 Requires-Dist: urllib3
 Provides-Extra: tests
 Requires-Dist: pyfakefs; extra == "tests"

{cryptoparser-1.0.1 → cryptoparser-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'CryptoParser'
-version = '1.0.1'
+version = '1.0.2'
 description = 'An analysis oriented security protocol parser and generator'
 authors = [
     {name = 'Szilárd Pfeiffer', email = 'coroner@pfeifferszilard.hu'}
@@ -19,7 +19,6 @@ classifiers=[
     'Intended Audience :: Information Technology',
     'Intended Audience :: Science/Research',
     'Intended Audience :: System Administrators',
-    'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
     'Natural Language :: English',
     'Operating System :: MacOS',
     'Operating System :: Microsoft :: Windows',
@@ -48,7 +47,7 @@ license = {text = 'MPL-2.0'}
 dependencies = [
     'asn1crypto',
     'attrs',
-    'cryptodatahub==1.0.1',
+    'cryptodatahub==1.0.2',
     'urllib3',
 ]
 
@@ -71,9 +70,6 @@ Source = 'https://gitlab.com/coroner/cryptoparser'
 [tool.variables]
 technical_name = 'cryptoparser'
 
-[tool.setuptools]
-license-files = ['LICENSE.txt']
-
 [tool.setuptools.packages.find]
 exclude = ['submodules']
 

cryptoparser-1.0.1/CryptoParser.egg-info/SOURCES.txt

@@ -1,245 +0,0 @@
-.coveragerc
-.flake8
-.gitignore
-.gitlab-ci.yml
-.gitmodules
-.pylintrc
-.readthedocs.yaml
-CHANGELOG.rst
-CONTRIBUTING.rst
-LICENSE.txt
-MANIFEST.in
-README.rst
-pyproject.toml
-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/__setup__.py
-cryptoparser/common/__init__.py
-cryptoparser/common/base.py
-cryptoparser/common/classes.py
-cryptoparser/common/exception.py
-cryptoparser/common/field.py
-cryptoparser/common/parse.py
-cryptoparser/common/utils.py
-cryptoparser/common/x509.py
-cryptoparser/dnsrec/__init__.py
-cryptoparser/dnsrec/record.py
-cryptoparser/dnsrec/txt.py
-cryptoparser/httpx/__init__.py
-cryptoparser/httpx/header.py
-cryptoparser/httpx/parse.py
-cryptoparser/httpx/version.py
-cryptoparser/ssh/__init__.py
-cryptoparser/ssh/key.py
-cryptoparser/ssh/record.py
-cryptoparser/ssh/subprotocol.py
-cryptoparser/ssh/version.py
-cryptoparser/tls/__init__.py
-cryptoparser/tls/algorithm.py
-cryptoparser/tls/ciphersuite.py
-cryptoparser/tls/extension.py
-cryptoparser/tls/grease.py
-cryptoparser/tls/ldap.py
-cryptoparser/tls/mysql.py
-cryptoparser/tls/openvpn.py
-cryptoparser/tls/postgresql.py
-cryptoparser/tls/rdp.py
-cryptoparser/tls/record.py
-cryptoparser/tls/subprotocol.py
-cryptoparser/tls/version.py
-docs/.gitignore
-docs/changelog.rst
-docs/conf.py
-docs/development.rst
-docs/features.rst
-docs/index.rst
-submodules/cryptodatahub/setup.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/__setup__.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/entity.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/exception.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/grade.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/key.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/parameter.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/stores.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/types.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/utils.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/dnsrec/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/dnsrec/algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/ssh/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/ssh/algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/tls/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/tls/algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/tls/client.py
-submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/tls/version.py
-submodules/cryptodatahub/build/lib/build/lib/docs/conf.py
-submodules/cryptodatahub/build/lib/build/lib/test/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/classes.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_entity.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_exception.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_grade.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_key.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_parameter.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_stores.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_types.py
-submodules/cryptodatahub/build/lib/build/lib/test/common/test_utils.py
-submodules/cryptodatahub/build/lib/build/lib/test/dnssec/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/test/dnssec/test_algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/test/ssh/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/test/ssh/test_algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/test/tls/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/test/tls/test_algorithm.py
-submodules/cryptodatahub/build/lib/build/lib/test/tls/test_client.py
-submodules/cryptodatahub/build/lib/build/lib/test/tls/test_version.py
-submodules/cryptodatahub/build/lib/build/lib/test/updaters/__init__.py
-submodules/cryptodatahub/build/lib/build/lib/test/updaters/test_common.py
-submodules/cryptodatahub/build/lib/build/lib/test/updaters/test_ct_log.py
-submodules/cryptodatahub/build/lib/build/lib/test/updaters/test_trust_stores.py
-submodules/cryptodatahub/build/lib/cryptodatahub/__init__.py
-submodules/cryptodatahub/build/lib/cryptodatahub/__setup__.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/__init__.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/algorithm.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/entity.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/exception.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/grade.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/key.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/parameter.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/stores.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/types.py
-submodules/cryptodatahub/build/lib/cryptodatahub/common/utils.py
-submodules/cryptodatahub/build/lib/cryptodatahub/dnsrec/__init__.py
-submodules/cryptodatahub/build/lib/cryptodatahub/dnsrec/algorithm.py
-submodules/cryptodatahub/build/lib/cryptodatahub/ssh/__init__.py
-submodules/cryptodatahub/build/lib/cryptodatahub/ssh/algorithm.py
-submodules/cryptodatahub/build/lib/cryptodatahub/tls/__init__.py
-submodules/cryptodatahub/build/lib/cryptodatahub/tls/algorithm.py
-submodules/cryptodatahub/build/lib/cryptodatahub/tls/client.py
-submodules/cryptodatahub/build/lib/cryptodatahub/tls/version.py
-submodules/cryptodatahub/build/lib/docs/conf.py
-submodules/cryptodatahub/build/lib/test/__init__.py
-submodules/cryptodatahub/build/lib/test/common/__init__.py
-submodules/cryptodatahub/build/lib/test/common/classes.py
-submodules/cryptodatahub/build/lib/test/common/test_algorithm.py
-submodules/cryptodatahub/build/lib/test/common/test_entity.py
-submodules/cryptodatahub/build/lib/test/common/test_exception.py
-submodules/cryptodatahub/build/lib/test/common/test_grade.py
-submodules/cryptodatahub/build/lib/test/common/test_key.py
-submodules/cryptodatahub/build/lib/test/common/test_parameter.py
-submodules/cryptodatahub/build/lib/test/common/test_stores.py
-submodules/cryptodatahub/build/lib/test/common/test_types.py
-submodules/cryptodatahub/build/lib/test/common/test_utils.py
-submodules/cryptodatahub/build/lib/test/dnssec/__init__.py
-submodules/cryptodatahub/build/lib/test/dnssec/test_algorithm.py
-submodules/cryptodatahub/build/lib/test/ssh/__init__.py
-submodules/cryptodatahub/build/lib/test/ssh/test_algorithm.py
-submodules/cryptodatahub/build/lib/test/tls/__init__.py
-submodules/cryptodatahub/build/lib/test/tls/test_algorithm.py
-submodules/cryptodatahub/build/lib/test/tls/test_client.py
-submodules/cryptodatahub/build/lib/test/tls/test_version.py
-submodules/cryptodatahub/build/lib/test/updaters/__init__.py
-submodules/cryptodatahub/build/lib/test/updaters/test_common.py
-submodules/cryptodatahub/build/lib/test/updaters/test_ct_log.py
-submodules/cryptodatahub/build/lib/test/updaters/test_trust_stores.py
-submodules/cryptodatahub/cryptodatahub/__init__.py
-submodules/cryptodatahub/cryptodatahub/__setup__.py
-submodules/cryptodatahub/cryptodatahub/common/__init__.py
-submodules/cryptodatahub/cryptodatahub/common/algorithm.py
-submodules/cryptodatahub/cryptodatahub/common/entity.py
-submodules/cryptodatahub/cryptodatahub/common/exception.py
-submodules/cryptodatahub/cryptodatahub/common/grade.py
-submodules/cryptodatahub/cryptodatahub/common/key.py
-submodules/cryptodatahub/cryptodatahub/common/parameter.py
-submodules/cryptodatahub/cryptodatahub/common/stores.py
-submodules/cryptodatahub/cryptodatahub/common/types.py
-submodules/cryptodatahub/cryptodatahub/common/utils.py
-submodules/cryptodatahub/cryptodatahub/dnsrec/__init__.py
-submodules/cryptodatahub/cryptodatahub/dnsrec/algorithm.py
-submodules/cryptodatahub/cryptodatahub/ssh/__init__.py
-submodules/cryptodatahub/cryptodatahub/ssh/algorithm.py
-submodules/cryptodatahub/cryptodatahub/tls/__init__.py
-submodules/cryptodatahub/cryptodatahub/tls/algorithm.py
-submodules/cryptodatahub/cryptodatahub/tls/client.py
-submodules/cryptodatahub/cryptodatahub/tls/version.py
-submodules/cryptodatahub/docs/conf.py
-submodules/cryptodatahub/test/__init__.py
-submodules/cryptodatahub/test/common/__init__.py
-submodules/cryptodatahub/test/common/classes.py
-submodules/cryptodatahub/test/common/test_algorithm.py
-submodules/cryptodatahub/test/common/test_entity.py
-submodules/cryptodatahub/test/common/test_exception.py
-submodules/cryptodatahub/test/common/test_grade.py
-submodules/cryptodatahub/test/common/test_key.py
-submodules/cryptodatahub/test/common/test_parameter.py
-submodules/cryptodatahub/test/common/test_stores.py
-submodules/cryptodatahub/test/common/test_types.py
-submodules/cryptodatahub/test/common/test_utils.py
-submodules/cryptodatahub/test/dnssec/__init__.py
-submodules/cryptodatahub/test/dnssec/test_algorithm.py
-submodules/cryptodatahub/test/ssh/__init__.py
-submodules/cryptodatahub/test/ssh/test_algorithm.py
-submodules/cryptodatahub/test/tls/__init__.py
-submodules/cryptodatahub/test/tls/test_algorithm.py
-submodules/cryptodatahub/test/tls/test_client.py
-submodules/cryptodatahub/test/tls/test_version.py
-submodules/cryptodatahub/test/updaters/__init__.py
-submodules/cryptodatahub/test/updaters/test_common.py
-submodules/cryptodatahub/test/updaters/test_ct_log.py
-submodules/cryptodatahub/test/updaters/test_trust_stores.py
-submodules/cryptodatahub/updaters/__init__.py
-submodules/cryptodatahub/updaters/common.py
-submodules/cryptodatahub/updaters/ct_log.py
-submodules/cryptodatahub/updaters/trust_stores.py
-test/__init__.py
-test/common/__init__.py
-test/common/classes.py
-test/common/test_algorithm.py
-test/common/test_base.py
-test/common/test_classes.py
-test/common/test_exception.py
-test/common/test_field.py
-test/common/test_parse.py
-test/common/test_utils.py
-test/common/test_x509.py
-test/common/certs/ecc256.badssl.com.pem
-test/common/certs/rsa8192.badssl.com.pem
-test/common/certs/rsa8192.badssl.com_certificate.crt
-test/common/certs/rsa8192.badssl.com_root_ca.crt
-test/common/certs/snakeoil_cert.pem
-test/dnsrec/__init__.py
-test/dnsrec/test_record.py
-test/dnsrec/test_txt.py
-test/httpx/__init__.py
-test/httpx/classes.py
-test/httpx/test_header.py
-test/httpx/test_version.py
-test/ssh/__init__.py
-test/ssh/test_ciphersuites.py
-test/ssh/test_key.py
-test/ssh/test_record.py
-test/ssh/test_subprotocol.py
-test/ssh/test_version.py
-test/tls/__init__.py
-test/tls/classes.py
-test/tls/test_alert.py
-test/tls/test_application_data.py
-test/tls/test_change_cipher_spec.py
-test/tls/test_ciphersuite.py
-test/tls/test_extension.py
-test/tls/test_grease.py
-test/tls/test_handshake.py
-test/tls/test_ldap.py
-test/tls/test_mysql.py
-test/tls/test_openvpn.py
-test/tls/test_postgresql.py
-test/tls/test_rdp.py
-test/tls/test_record.py
-test/tls/test_version.py

cryptoparser-1.0.1/MANIFEST.in

@@ -1 +0,0 @@
-include *.rst

cryptoparser-1.0.1/submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/__setup__.py

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import importlib.metadata
-
-metadata = importlib.metadata.metadata('cryptodatahub')
-
-__title__ = metadata['Name']
-__technical_name__ = __title__.lower()
-__version__ = metadata['Version']
-__description__ = metadata['Summary']
-__author__ = metadata['Author']
-__author_email__ = metadata['Author-email']
-__url__ = 'https://gitlab.com/coroner/' + __technical_name__
-__license__ = metadata['License']

cryptoparser-1.0.1/submodules/cryptodatahub/build/lib/build/lib/cryptodatahub/common/algorithm.py

@@ -1,163 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import enum
-
-import attr
-
-from cryptodatahub.common.grade import (
-    AttackType,
-    Grade,
-    GradeableComplex,
-    GradeableVulnerabilities,
-    Vulnerability,
-)
-from cryptodatahub.common.types import (
-    CryptoDataEnumBase,
-    CryptoDataEnumOIDBase,
-    CryptoDataParamsEnumString,
-    CryptoDataParamsNamed,
-    CryptoDataParamsOIDOptional,
-    convert_enum,
-)
-
-
-@attr.s(frozen=True)
-class AuthenticationParams(CryptoDataParamsOIDOptional, GradeableVulnerabilities):
-    anonymous = attr.ib(validator=attr.validators.instance_of(bool))
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'authentication'
-
-
-@attr.s(frozen=True)
-class BlockCipherParams(CryptoDataParamsNamed, GradeableVulnerabilities):
-    key_size = attr.ib(validator=attr.validators.instance_of(int))
-    block_size = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(int)))
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'block cipher'
-
-
-@attr.s(frozen=True)
-class BlockCipherModeParams(CryptoDataParamsNamed, GradeableVulnerabilities):
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'block cipher mode'
-
-
-@attr.s(frozen=True)
-class HashParams(CryptoDataParamsOIDOptional, GradeableVulnerabilities):
-    digest_size = attr.ib(validator=attr.validators.instance_of(int))
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'hash'
-
-
-@attr.s(frozen=True)
-class KeyExchangeParams(CryptoDataParamsNamed, GradeableVulnerabilities):
-    forward_secret = attr.ib(validator=attr.validators.instance_of(bool))
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'key exchange'
-
-
-NamedGroupType = enum.Enum('NamedGroupType', 'ELLIPTIC_CURVE FINITE_FIELD HYBRID_PQS')
-
-
-@attr.s(frozen=True)
-class NamedGroupParams(CryptoDataParamsOIDOptional, GradeableVulnerabilities):
-    size = attr.ib(validator=attr.validators.instance_of(int))
-    group_type = attr.ib(
-        converter=convert_enum(NamedGroupType),
-        validator=attr.validators.instance_of(NamedGroupType),
-    )
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'named group'
-
-
-Authentication = CryptoDataEnumOIDBase('Authentication', CryptoDataEnumOIDBase.get_json_records(AuthenticationParams))
-BlockCipher = CryptoDataEnumBase('BlockCipher', CryptoDataEnumBase.get_json_records(BlockCipherParams))
-BlockCipherMode = CryptoDataEnumBase('BlockCipherMode', CryptoDataEnumBase.get_json_records(BlockCipherModeParams))
-Hash = CryptoDataEnumOIDBase('Hash', CryptoDataEnumOIDBase.get_json_records(HashParams))
-KeyExchange = CryptoDataEnumBase('KeyExchange', CryptoDataEnumBase.get_json_records(KeyExchangeParams))
-NamedGroup = CryptoDataEnumOIDBase('NamedGroup', CryptoDataEnumOIDBase.get_json_records(NamedGroupParams))
-
-
-@attr.s(frozen=True)
-class MACParams(CryptoDataParamsOIDOptional, GradeableVulnerabilities):
-    digest_size = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(int)))
-    hash_algorithm = attr.ib(validator=attr.validators.optional(attr.validators.instance_of((Hash, str))))
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'MAC'
-
-    def __attrs_post_init__(self):
-        if (self.digest_size is None) == (self.hash_algorithm is None):
-            raise ValueError()
-
-        if isinstance(self.hash_algorithm, str):
-            object.__setattr__(self, 'hash_algorithm', Hash[self.hash_algorithm])
-
-        if self.digest_size is None:
-            object.__setattr__(self, 'digest_size', self.hash_algorithm.value.digest_size)
-
-        attr.validate(self)
-
-
-MAC = CryptoDataEnumOIDBase('MAC', CryptoDataEnumOIDBase.get_json_records(MACParams))
-
-
-@attr.s(frozen=True)
-class MACModeParams(CryptoDataParamsEnumString, GradeableVulnerabilities):
-    name = attr.ib(validator=attr.validators.instance_of(str))
-
-    @classmethod
-    def get_gradeable_name(cls):
-        return 'MAC mode'
-
-
-class MACMode(enum.Enum):
-    ENCRYPT_THEN_MAC = MACModeParams(
-        code='encrypt_then_mac',
-        name='encrypt then MAC',
-        vulnerabilities=[],
-    )
-    ENCRYPT_AND_MAC = MACModeParams(
-        code='encrypt_and_mac',
-        name='encrypt and MAC',
-        vulnerabilities=[
-            Vulnerability(attack_type=AttackType.FORGERY_ATTACK, grade=Grade.WEAK, named=None),
-        ],
-    )
-    MAC_THEN_ENCRYP = MACModeParams(
-        code='mac_then_encrypt',
-        name='MAC then encrypt',
-        vulnerabilities=[],
-    )
-
-
-@attr.s(frozen=True)
-class SignatureParams(CryptoDataParamsOIDOptional, GradeableComplex):
-    key_type = attr.ib(
-        converter=convert_enum(Authentication),
-        validator=attr.validators.instance_of(Authentication),
-    )
-    hash_algorithm = attr.ib(
-        converter=convert_enum(Hash),
-        validator=attr.validators.optional(attr.validators.instance_of(Hash)),
-    )
-
-    def __attrs_post_init__(self):
-        object.__setattr__(self, 'gradeables', [self.hash_algorithm.value])
-
-        attr.validate(self)
-
-
-Signature = CryptoDataEnumOIDBase('Signature', CryptoDataEnumOIDBase.get_json_records(SignatureParams))