CryptoDataHub 0.11.2__tar.gz → 0.12.2__tar.gz

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/CHANGELOG.rst

@@ -2,6 +2,36 @@
 Changelog
 =========
 
+-------------------
+0.12.2 - 2024-01-11
+-------------------
+
+Improvements
+============
+
+-  Generic
+
+   -  add metadata to documentation
+   -  add getter for well-know DH parameter by parameter numbers
+
+-------------------
+0.12.1 - 2023-12-13
+-------------------
+
+Improvements
+============
+
+-  SSH
+
+   -  add missing compression algorithms (#16)
+   -  add missing encryption algorithms (#16)
+   -  add missing host key algorithms (#16)
+   -  add missing KEX algorithms (#16)
+
+-  TLS
+
+   -  add grade for SSL cipher kinds (#18)
+
 -------------------
 0.11.2 - 2023-11-13
 -------------------
@@ -18,7 +48,7 @@ Refactor
 
 -  Generic
 
-    -  move HTTP fetcher and digest generation to common utils
+   -  move HTTP fetcher and digest generation to common utils
 
 -------------------
 0.11.1 - 2023-11-06

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/CryptoDataHub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CryptoDataHub
-Version: 0.11.2
+Version: 0.12.2
 Summary: Repository of cryptography-related data
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CryptoDataHub
-Version: 0.11.2
+Version: 0.12.2
 Summary: Repository of cryptography-related data
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/__setup__.py

@@ -2,7 +2,7 @@
 
 __title__ = 'CryptoDataHub'
 __technical_name__ = __title__.lower()
-__version__ = '0.11.2'
+__version__ = '0.12.2'
 __description__ = 'Repository of cryptography-related data'
 __author__ = 'Szilárd Pfeiffer'
 __author_email__ = 'coroner@pfeifferszilard.hu'

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/algorithm.py

@@ -115,7 +115,7 @@ class MACParams(CryptoDataParamsOIDOptional, GradeableVulnerabilities):
 MAC = CryptoDataEnumOIDBase('MAC', CryptoDataEnumOIDBase.get_json_records(MACParams))
 
 
-@attr.s
+@attr.s(frozen=True)
 class MACModeParams(CryptoDataParamsEnumString, GradeableVulnerabilities):
     name = attr.ib(validator=attr.validators.instance_of(six.string_types))
 

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/authentication.json

@@ -102,5 +102,12 @@
         "oid": null,
         "vulnerabilities": [],
         "anonymous": false
+    },
+    "XMSS": {
+        "name": "XMSS",
+        "long_name": "eXtended Merkle Signature Scheme",
+        "oid": null,
+        "vulnerabilities": [],
+        "anonymous": false
     }
 }

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/block-cipher-mode.json

@@ -33,13 +33,7 @@
     "CTR": {
         "name": "CTR",
         "long_name": "counter",
-        "vulnerabilities": [
-            {
-                "attack_type": "REUSED_KEY_ATTACK",
-                "grade": "WEAK",
-                "named": null
-            }
-        ]
+        "vulnerabilities": []
     },
     "ECB": {
         "name": "ECB",

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/block-cipher.json

@@ -85,7 +85,7 @@
             }
         ],
         "key_size": 192,
-        "block_size": 192
+        "block_size": 128
     },
     "TWOFISH256": {
         "name": "Twofish-256",
@@ -98,7 +98,7 @@
             }
         ],
         "key_size": 256,
-        "block_size": 256
+        "block_size": 128
     },
     "CAMELLIA_128": {
         "name": "Camellia-128",
@@ -107,6 +107,13 @@
         "key_size": 128,
         "block_size": 128
     },
+    "CAMELLIA_192": {
+        "name": "Camellia-192",
+        "long_name": null,
+        "vulnerabilities": null,
+        "key_size": 192,
+        "block_size": 128
+    },
     "CAMELLIA_256": {
         "name": "Camellia-256",
         "long_name": null,
@@ -431,6 +438,13 @@
         "key_size": 256,
         "block_size": 128
     },
+    "SM4": {
+        "name": "SM4",
+        "long_name": "ShangMi 4",
+        "vulnerabilities": [],
+        "key_size": 128,
+        "block_size": 128
+    },
     "TRIPLE_DES": {
         "name": "3DES",
         "long_name": "Triple DES",

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/hash.json

@@ -45,7 +45,7 @@
                 "named": null
             }
         ],
-        "digest_size": 64
+        "digest_size": 128
     },
     "RIPEMD128": {
         "name": "RIPEMD-128",
@@ -99,6 +99,19 @@
         ],
         "digest_size": 160
     },
+    "SHA1_96": {
+        "name": "SHA-1/96",
+        "long_name": "Secure Hash Algorithm 1 (96)",
+        "oid": null,
+        "vulnerabilities": [
+            {
+                "attack_type": "COLLISION",
+                "grade": "WEAK",
+                "named": null
+            }
+        ],
+        "digest_size": 96
+    },
     "SHA2_224": {
         "name": "SHA-224",
         "long_name": "Secure Hash Algorithm 2 (224)",
@@ -183,6 +196,13 @@
         "vulnerabilities": null,
         "digest_size": 256
     },
+    "SM3": {
+        "name": "SM3",
+        "long_name": "ShangMi 3",
+        "oid": "1.2.156.10197.1.401",
+        "vulnerabilities": null,
+        "digest_size": 256
+    },
     "TIGER_128": {
         "name": "Tiger/128",
         "long_name": null,
@@ -194,7 +214,13 @@
         "name": "Tiger/128(96)",
         "long_name": null,
         "oid": null,
-        "vulnerabilities": null,
+        "vulnerabilities": [
+            {
+                "attack_type": "COLLISION",
+                "grade": "WEAK",
+                "named": null
+            }
+        ],
         "digest_size": 96
     },
     "TIGER_160": {
@@ -208,7 +234,13 @@
         "name": "Tiger/160(96)",
         "long_name": null,
         "oid": null,
-        "vulnerabilities": null,
+        "vulnerabilities": [
+            {
+                "attack_type": "COLLISION",
+                "grade": "WEAK",
+                "named": null
+            }
+        ],
         "digest_size": 96
     },
     "TIGER_192": {
@@ -222,7 +254,13 @@
         "name": "Tiger/192(96)",
         "long_name": null,
         "oid": null,
-        "vulnerabilities": null,
+        "vulnerabilities": [
+            {
+                "attack_type": "COLLISION",
+                "grade": "WEAK",
+                "named": null
+            }
+        ],
         "digest_size": 96
     },
     "WHIRLPOOL": {

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/key.py

@@ -37,7 +37,7 @@ class _PublicKeySizeGradeable(GradeableVulnerabilities):
         return 'public key size'
 
 
-@attr.s
+@attr.s(frozen=True)
 class PublicKeySize(GradeableComplex):
     _FINITE_FIELD_TYPES = [Authentication.RSA, Authentication.DSS, KeyExchange.ADH, KeyExchange.DH, KeyExchange.DHE]
     _ELLIPTIC_CURVE_TYPES = [Authentication.ECDSA, Authentication.EDDSA, KeyExchange.ECDH, KeyExchange.ECDHE]
@@ -110,12 +110,12 @@ def convert_public_key_size(key_exchange):
     return _PublicKeySizeConverter(key_exchange)
 
 
-@attr.s
+@attr.s(frozen=True)
 class PublicKeyParamBase(object):
     pass
 
 
-@attr.s
+@attr.s(frozen=True)
 class PublicKeyParamsDsa(PublicKeyParamBase):
     prime = attr.ib(validator=attr.validators.instance_of(six.integer_types))
     generator = attr.ib(validator=attr.validators.instance_of(six.integer_types))
@@ -123,7 +123,7 @@ class PublicKeyParamsDsa(PublicKeyParamBase):
     public_key_value = attr.ib(validator=attr.validators.instance_of(six.integer_types))
 
 
-@attr.s
+@attr.s(frozen=True)
 class PublicKeyParamsEcdsa(PublicKeyParamBase):
     named_group = attr.ib(validator=attr.validators.instance_of(NamedGroup))
     point_x = attr.ib(validator=attr.validators.instance_of(six.integer_types))
@@ -143,19 +143,19 @@ class PublicKeyParamsEcdsa(PublicKeyParamBase):
         return bytes(asn1crypto.keys.ECPointBitString.from_coords(self.point_x, self.point_y))
 
 
-@attr.s
+@attr.s(frozen=True)
 class PublicKeyParamsEddsa(PublicKeyParamBase):
     curve_type = attr.ib(validator=attr.validators.instance_of(NamedGroup))
     key_data = attr.ib(validator=attr.validators.instance_of((bytes, bytearray)))
 
 
-@attr.s
+@attr.s(frozen=True)
 class PublicKeyParamsRsa(PublicKeyParamBase):
     modulus = attr.ib(validator=attr.validators.instance_of(six.integer_types))
     public_exponent = attr.ib(validator=attr.validators.instance_of(six.integer_types))
 
 
-@attr.s(eq=False)
+@attr.s(eq=False, frozen=True)
 class PublicKey(object):
     _public_key = attr.ib(validator=attr.validators.instance_of(asn1crypto.keys.PublicKeyInfo))
 
@@ -363,7 +363,7 @@ class PublicKeySigned(PublicKey):
         raise NotImplementedError()
 
 
-@attr.s(eq=False, init=False)
+@attr.s(eq=False, init=False, frozen=True)
 class PublicKeyX509Base(PublicKeySigned):  # pylint: disable=too-many-public-methods
     _EV_OIDS_BY_CA = {
         'A-Trust': ('1.2.40.0.17.1.22', ),
@@ -424,7 +424,7 @@ class PublicKeyX509Base(PublicKeySigned):  # pylint: disable=too-many-public-met
     def __init__(self, certificate):
         super(PublicKeySigned, self).__init__(certificate.public_key)
 
-        self._certificate = certificate
+        object.__setattr__(self, '_certificate', certificate)
 
     @classmethod
     def _get_type_name(cls):

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/mac.json

@@ -31,6 +31,54 @@
         "digest_size": 256,
         "hash_algorithm": null
     },
+    "CBCMAC_3DES": {
+        "name": "CBC-MAC 3DES",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": null,
+        "digest_size": 64,
+        "hash_algorithm": null
+    },
+    "CBCMAC_AES": {
+        "name": "CBC-MAC AES",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": null,
+        "digest_size": 128,
+        "hash_algorithm": null
+    },
+    "CBCMAC_BLOWFISH": {
+        "name": "CBC-MAC Blowfish",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": null,
+        "digest_size": 64,
+        "hash_algorithm": null
+    },
+    "CBCMAC_DES": {
+        "name": "CBC-MAC DES",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": null,
+        "digest_size": 64,
+        "hash_algorithm": null
+    },
+    "CBCMAC_RIJNDAEL": {
+        "name": "CBC-MAC Rijndael",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": null,
+        "digest_size": 128,
+        "hash_algorithm": null
+    },
+    "CBCMAC_TWOFISH": {
+        "name": "CBC-MAC Twofish",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": null,
+        "digest_size": 128,
+        "hash_algorithm": null
+    },
     "CRYPTICORE": {
         "name": "CryptiCore",
         "long_name": "CryptiCore (Badger)",
@@ -239,6 +287,14 @@
         "digest_size": null,
         "hash_algorithm": "SHA3_512"
     },
+    "SM3": {
+        "name": "SM3",
+        "long_name": "ShangMi 3",
+        "oid": "1.2.156.10197.1.401.2",
+        "vulnerabilities": [],
+        "digest_size": null,
+        "hash_algorithm": "SM3"
+    },
     "TIGER_128": {
         "name": "Tiger/128",
         "long_name": null,

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/parameter.py

@@ -48,7 +48,7 @@ class DHParameterNumbers(object):
         return self.p == other.p and self.g == other.g and (self.q is None or self.q == other.q)
 
 
-@attr.s(eq=False)
+@attr.s(eq=False, frozen=True)
 class DHParamWellKnownParams(CryptoDataParamsBase, GradeableVulnerabilities):
     parameter_numbers = attr.ib(
         converter=convert_dict_to_object(DHParameterNumbers),
@@ -77,4 +77,12 @@ class DHParamWellKnownParams(CryptoDataParamsBase, GradeableVulnerabilities):
         return '{}-bit {} {} DH parameter'.format(self.key_size, self.source.value.name, self.name)
 
 
-DHParamWellKnown = CryptoDataEnumBase('DHParamWellKnown', CryptoDataEnumBase.get_json_records(DHParamWellKnownParams))
+class DHParamWellKnownBase(CryptoDataEnumBase):
+    @classmethod
+    def from_parameter_numbers(cls, parameter_numbers):
+        return cls._from_attr('parameter_numbers', parameter_numbers)
+
+
+DHParamWellKnown = DHParamWellKnownBase(
+    'DHParamWellKnown', DHParamWellKnownBase.get_json_records(DHParamWellKnownParams)
+)

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/signature.json

@@ -222,5 +222,12 @@
         "oid": null,
         "key_type": "EDDSA",
         "hash_algorithm": "SHAKE_256"
+    },
+    "XMSS": {
+        "name": "XMSS",
+        "long_name": null,
+        "oid": null,
+        "key_type": "XMSS",
+        "hash_algorithm": "SHA2_256"
     }
 }

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/stores.py

@@ -41,7 +41,7 @@ CertificateTransparencyLogStateType = enum.Enum(
 )
 
 
-@attr.s
+@attr.s(frozen=True)
 class CertificateTransparencyLogState(CryptoDataParamsBase):
     state_type = attr.ib(
         converter=convert_enum(CertificateTransparencyLogStateType),
@@ -53,7 +53,7 @@ class CertificateTransparencyLogState(CryptoDataParamsBase):
     )
 
 
-@attr.s
+@attr.s(frozen=True)
 class CertificateTransparencyLogTemporalInterval(CryptoDataParamsBase):
     start_inclusive = attr.ib(
         converter=convert_datetime(),
@@ -65,7 +65,7 @@ class CertificateTransparencyLogTemporalInterval(CryptoDataParamsBase):
     )
 
 
-@attr.s
+@attr.s(frozen=True)
 class CertificateTransparencyLogParamsBase(CryptoDataParamsBase):
     log_id = attr.ib(
         converter=convert_base64_data(),
@@ -75,7 +75,8 @@ class CertificateTransparencyLogParamsBase(CryptoDataParamsBase):
 
 
 class CertificateTransparencyLogUnknown(CertificateTransparencyLogParamsBase):
-    pass
+    def __str__(self):
+        return str(self.log_id)
 
 
 @attr.s(frozen=True)
@@ -131,6 +132,11 @@ class CertificateTransparencyLogParams(  # pylint: disable=too-many-instance-att
         if self.mmd < 1:
             raise ValueError(self.mmd)
 
+    def __str__(self):
+        return '{} ({})'.format(
+            self.description, self.log_id
+        )
+
     @classmethod
     def description_to_enum_item_name(cls, description):
         name = name_to_enum_item_name(description)
@@ -208,7 +214,7 @@ def convert_root_certificate_params():
     return _RootCertificateParamCertificateConverter()
 
 
-@attr.s
+@attr.s(frozen=True)
 class RootCertificateTrustStoreConstraint(CryptoDataParamsBase):
     owner = attr.ib(
         converter=convert_enum(Entity),
@@ -221,7 +227,7 @@ class RootCertificateTrustStoreConstraint(CryptoDataParamsBase):
     )
 
 
-@attr.s
+@attr.s(frozen=True)
 class RootCertificateParams(CryptoDataParamsFetchedBase):
     certificate = attr.ib(
         converter=convert_root_certificate_params(),

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/common/types.py

@@ -502,7 +502,7 @@ class CryptoDataEnumBase(enum.Enum):
     @classmethod
     def _from_attr(cls, attr_name, value):
         for item in cls:
-            if getattr(item.value, attr_name) == value:
+            if value == getattr(item.value, attr_name):
                 return item
 
         raise InvalidValue(value, cls, attr_name)

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/ssh/algorithm.py

@@ -27,7 +27,7 @@ from cryptodatahub.common.types import (
 )
 
 
-@attr.s
+@attr.s(frozen=True)
 class SshAlgorithmParams(CryptoDataParamsEnumString, GradeableComplex):
     @property
     @abc.abstractmethod
@@ -52,15 +52,15 @@ class SshAlgorithmParams(CryptoDataParamsEnumString, GradeableComplex):
         attr.validate(self)
 
 
-@attr.s
+@attr.s(frozen=True)
 class EncryptionAlgorithmParams(SshAlgorithmParams):
     cipher = attr.ib(
         converter=convert_enum(BlockCipher),
-        validator=attr.validators.optional(attr.validators.instance_of((BlockCipher, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(BlockCipher))
     )
     mode = attr.ib(
         converter=convert_enum(BlockCipherMode),
-        validator=attr.validators.optional(attr.validators.instance_of((BlockCipherMode, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(BlockCipherMode))
     )
 
     @property
@@ -68,16 +68,16 @@ class EncryptionAlgorithmParams(SshAlgorithmParams):
         return ('cipher', 'mode')
 
 
-@attr.s
+@attr.s(frozen=True)
 class MacAlgorithmParams(SshAlgorithmParams):
     truncated_size = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(int)))
     mac = attr.ib(
         converter=convert_enum(MAC),
-        validator=attr.validators.optional(attr.validators.instance_of((MAC, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(MAC))
     )
     mode = attr.ib(
         converter=convert_enum(MACMode),
-        validator=attr.validators.optional(attr.validators.instance_of((MACMode, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(MACMode))
     )
 
     @property
@@ -92,11 +92,11 @@ class MacAlgorithmParams(SshAlgorithmParams):
         return ('mac', 'mode')
 
 
-@attr.s
+@attr.s(frozen=True)
 class KexAlgorithmParams(SshAlgorithmParams):
     kex = attr.ib(
         converter=convert_enum(KeyExchange),
-        validator=attr.validators.optional(attr.validators.instance_of((KeyExchange, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(KeyExchange))
     )
     key_parameter = attr.ib(
         converter=convert_variadic((convert_enum(NamedGroup), convert_enum(DHParamWellKnown))),
@@ -106,7 +106,7 @@ class KexAlgorithmParams(SshAlgorithmParams):
     )
     exchange_hash = attr.ib(
         converter=convert_enum(Hash),
-        validator=attr.validators.optional(attr.validators.instance_of((Hash, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(Hash))
     )
     key_size = attr.ib(validator=attr.validators.optional(attr.validators.instance_of(int)))
 
@@ -136,20 +136,22 @@ class SshHostKeyType(enum.Enum):
     HOST_KEY = 'host key'
     HOST_CERTIFICATE = 'host certificate'
     PGP_KEY = 'PGP key'
+    SECURE_KEY = 'secure key'
+    SECURE_CERTIFICATE = 'secure certificate'
     SPKI_KEY = 'SPKI key'
     X509_CERTIFICATE = 'X.509 certificate'
     X509_CERTIFICATE_CHAIN = 'X.509 certificate chain'
 
 
-@attr.s
+@attr.s(frozen=True)
 class HostKeyAlgorithmParams(SshAlgorithmParams):
     key_type = attr.ib(
         converter=convert_enum(SshHostKeyType),
-        validator=attr.validators.instance_of((SshHostKeyType, six.string_types))
+        validator=attr.validators.instance_of(SshHostKeyType)
     )
     signature = attr.ib(
         converter=convert_enum(Signature),
-        validator=attr.validators.optional(attr.validators.instance_of((Signature, six.string_types)))
+        validator=attr.validators.optional(attr.validators.instance_of(Signature))
     )
 
     @property
@@ -157,14 +159,14 @@ class HostKeyAlgorithmParams(SshAlgorithmParams):
         return ('signature',)
 
 
-@attr.s
+@attr.s(frozen=True)
 class CompressionAlgorithmParams(CryptoDataParamsEnumString, GradeableVulnerabilities):
     @classmethod
     def get_gradeable_name(cls):
         return 'compression'
 
 
-@attr.s
+@attr.s(frozen=True)
 class EllipticCurveIdentifierParams(CryptoDataParamsEnumString):
     named_group = attr.ib(
         converter=convert_enum(NamedGroup),

{CryptoDataHub-0.11.2 → CryptoDataHub-0.12.2}/cryptodatahub/ssh/compression-algorithm.json

@@ -13,6 +13,10 @@
             }
         ]
     },
+    "LZ4_SENSORSDATA_CN": {
+        "code": "lz4@sensorsdata.cn",
+        "vulnerabilities": []
+    },
     "NONE": {
         "code": "none",
         "vulnerabilities": []