CryptoDataHub 0.11.1__py3-none-any.whl → 0.12.1__py3-none-any.whl

{CryptoDataHub-0.11.1.dist-info → CryptoDataHub-0.12.1.dist-info}/METADATA

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

{CryptoDataHub-0.11.1.dist-info → CryptoDataHub-0.12.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 cryptodatahub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cryptodatahub/__setup__.py,sha256=CyYEad_mWnGgqCpgRPW_Ri3T0f0iiu-Jec5uK-V65PY,341
+cryptodatahub/__setup__.py,sha256=iEJc5wk-z3-oPZ3sy50Md7HDSA9xFl61dxycd3msR8g,341
 cryptodatahub/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cryptodatahub/common/algorithm.py,sha256=ddP9GjrIoEmeCI5o4QWnKo4aXtQO4pTWIUvkkr4IrFU,5128
+cryptodatahub/common/algorithm.py,sha256=HVAgvtJOTPZNIQxgojYe6UPKBX1Pcds17FqeQCspULE,5141
 cryptodatahub/common/attack-named.json,sha256=2LsTtaJO_c3rkixCIHyPrx_Lm8tsHsl2pNCP9WZdshk,1968
 cryptodatahub/common/attack-type.json,sha256=_yGL43QSrScyTbn1vOTqTdJYHcbO8vv16A0oaOOClsQ,1364
-cryptodatahub/common/authentication.json,sha256=BIT1avovyADkYaNAV-deMQ8eu1-YLxPwOWTyagQxGV0,2692
-cryptodatahub/common/block-cipher-mode.json,sha256=POynUEy23YiEoeV3612IgU21yTaCWFig6-qeF025qBI,1914
-cryptodatahub/common/block-cipher.json,sha256=7VqQkPGAYj_cMgH_osiDf4slEyobH0E-Nu-_sKekmQs,10994
+cryptodatahub/common/authentication.json,sha256=CSwgoPLslmN2ll2hKNpkWoUgC5YMIT_Gg6U0_pkXzH0,2873
+cryptodatahub/common/block-cipher-mode.json,sha256=ebTbLuZutec4AY7F9IMpEZpxgVXOdzOON4QQp0u7jjE,1762
+cryptodatahub/common/block-cipher.json,sha256=15J6EJd8zS4CJhDOuPfTsE8473blSOJBSAk6-dyEfag,11325
 cryptodatahub/common/certificate-transparency-log.json,sha256=0Lg80NnztHj-0bRL1ViRAbmFT53-_srGsdNQpA5k-j0,71716
 cryptodatahub/common/client.json,sha256=HARcKLMHtw3GSNlC50H6ZmqriENEXG6hesD10j3Coz0,418
 cryptodatahub/common/dhparam-well-known.json,sha256=Zk3jnTT1XDnyOxEUU9h2TCPzTDzApRCBMR8EKWo5ylA,109441
@@ -14,19 +14,19 @@ cryptodatahub/common/entity.json,sha256=fJ-NnKvbW_3OKM8a1tNUzl7WaZKOMYtGrj7WetXO
 cryptodatahub/common/entity.py,sha256=MAUJS9D7hFyXGis0dzzfjj71h7Uo_0eC_tYXS-q5mso,3256
 cryptodatahub/common/exception.py,sha256=cXA0YOoQdIExdF9dGeneOiF3khCmwaBtsDZ8fQ-bzGM,854
 cryptodatahub/common/grade.py,sha256=Q7nuWUX1ON_n5vEiYyLfwn09S_TMdm3uUZPLkLtNU40,5326
-cryptodatahub/common/hash.json,sha256=fhxjM1hReGlHn3s7ywFGUPAzHNFrOPcHCrzUiV1kFc0,6244
-cryptodatahub/common/key-exchange.json,sha256=wMzNEXEBh9fDxt8B-lhBnXivCIb0_Rb3_nLF9vUq3QQ,3583
-cryptodatahub/common/key.py,sha256=EK_fVJ6IXOzm0O416MiuT4zfWDiC1cLBvCH-pMpOukE,20364
-cryptodatahub/common/mac.json,sha256=0P8peHS7x_Ji8-zrI78mqLlVYKdtNjb25Nx98_y1np8,9208
+cryptodatahub/common/hash.json,sha256=sCcuyUxusTia-aceCuVxBdte_u4v2_swbpRvu0XNjto,7173
+cryptodatahub/common/key-exchange.json,sha256=pukNOs6Bx8dkO2dYVr2_qdvodvz4i8-aSHmZusAS-PA,3581
+cryptodatahub/common/key.py,sha256=9K-CrJpb7Ioyy_vPwvnliPxhRV7AMeO-25WcWaNy29g,20229
+cryptodatahub/common/mac.json,sha256=L0hL8Etu_g91nxAA5GJ1wt5avZtVDgE5RvVXrVD1Xfw,10632
 cryptodatahub/common/named-group.json,sha256=f37_pX3vEFub1v_j0RrSVHxDcgGYuPJItruR9u1L3Uk,21721
-cryptodatahub/common/parameter.py,sha256=YkipNthMdhH7ptMLhHt2rHy4jmP3aHOk6QXR7VE4Uns,2763
+cryptodatahub/common/parameter.py,sha256=c3wJxjLPsbLbFgxYVXJ_JfiYImpQ87HLgC1G9h3IJbk,2776
 cryptodatahub/common/root-certificate.json,sha256=nZd0vzxgFgW2T3UT2Vd_z6RN57TNOVB6rI4eNjLEReg,1061722
 cryptodatahub/common/server.json,sha256=rxmCmZ86OCHb_q6-KL2p3zFXcgivifZoUIDXlSgOsto,1080
-cryptodatahub/common/signature.json,sha256=uY0CkO0_j_RYhd3cKMUcoQytj7RmOSHzNANtWF_c5jU,6718
+cryptodatahub/common/signature.json,sha256=YY51O_29wVG1LfQnnq8bERTiytc6v7B3UsqKCq_DoAA,6876
 cryptodatahub/common/standard.json,sha256=w0c3pbu3Bxk9pK65a3_7Gsc7pXA7PzxNSIGD6Na4kWk,720
-cryptodatahub/common/stores.py,sha256=jXof7EP0JMRS4bhVGS83BQEF9UU9atQnOX6XjcHGz5w,10391
+cryptodatahub/common/stores.py,sha256=tdD9b3GW4CB55whbBlqmpvv70PsdibkCM2tVO95gX0g,10545
 cryptodatahub/common/types.py,sha256=BtFg4hupSfUZydzCQROV40j53ZPL12MqkQsFOa9zWuQ,13946
-cryptodatahub/common/utils.py,sha256=SXDNw8VKgvkX5g6S3sJimn89zcXjU2MbTGsZcy6G_Fc,892
+cryptodatahub/common/utils.py,sha256=xjlQRBwDRzjH7q0Qr5djhK2EIG_YNMv35mkrHXbECCw,3114
 cryptodatahub/common/vulnerability.json,sha256=2RQXb9UL1_VlcAAGoxqpe3nTrRfO4gyOX_IGHVy3SBc,4
 cryptodatahub/dnsrec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cryptodatahub/dnsrec/algorithm.json,sha256=Ejk6xbxcLjURQvFpofM6rxKKjfKknj4x_6X4mWaIiFw,3025
@@ -34,21 +34,21 @@ cryptodatahub/dnsrec/algorithm.py,sha256=rdKc4ib7xCA4yPqc9645rmTGPfJuucN3mvmp4aj
 cryptodatahub/dnsrec/digest-type.json,sha256=U1iUv3Q5TLidAoDozPWVP5HnyTdTwU8MVdcHKdtoTs4,529
 cryptodatahub/dnsrec/rr-type.json,sha256=DxcOyRQHHSgHUgL7K2mxSbAmvl96VdorClEiz1lG4t8,17912
 cryptodatahub/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cryptodatahub/ssh/algorithm.py,sha256=dPwVe9J040i91oeTbV7E0r194OqtqbvWo-3XiTqVsPk,5938
-cryptodatahub/ssh/compression-algorithm.json,sha256=OZTMRnYetpcabzmvkkQOrrCrU02mvOk-adiBW4Km_j4,399
+cryptodatahub/ssh/algorithm.py,sha256=Jvguv_6_IbvogpmQlMDu7CjPCaPVws2_bdjG5g43NHA,5945
+cryptodatahub/ssh/compression-algorithm.json,sha256=yOmr96mjPvZrmzhV9kL6eo7Jf4lvv04DJ1mUeKzuQVw,502
 cryptodatahub/ssh/elliptic-curve-identifier.json,sha256=r_hRJdog7DllJjwB7I7ScEIHNWvlxXwfaTawDkt_FzM,1115
-cryptodatahub/ssh/encryption-algorithm.json,sha256=CXZ-62GldH3ObHpGft8WN3uW1F21SvFUWikLH7QGYCk,8506
-cryptodatahub/ssh/host-key-algorithm.json,sha256=7NzcHA8NtRxHUmX1-mtmQIL3EkgxueIv-rqi0hABU2M,10697
-cryptodatahub/ssh/kex-algorithm.json,sha256=VBI5dUf7eahs15UqSdBm4lrphK_ln_dYbbkqA4n8vHg,12637
-cryptodatahub/ssh/mac-algorithm.json,sha256=t5rBPOdVPplssq8GLiLE0xrat0HwXqYbJ66aVqXo344,11882
+cryptodatahub/ssh/encryption-algorithm.json,sha256=TprZV9pSLfFzonU0_hHWkobHXTqeJIF1rQq2Kf-y0tE,13718
+cryptodatahub/ssh/host-key-algorithm.json,sha256=t8GNvmL8tmuBFNC7Y7RS4DL0megr3VFg5iAqvVQMweo,15474
+cryptodatahub/ssh/kex-algorithm.json,sha256=NZ8SFjVcRJ0g9S7_r3NT5XtoBp8CgDHLyjacvl8b-EA,21872
+cryptodatahub/ssh/mac-algorithm.json,sha256=6tiN9gfnK1P-SPebXSjap0Ahn_i6oVq6Zj1Oa7F0miE,15470
 cryptodatahub/tls/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cryptodatahub/tls/algorithm.py,sha256=0nkklNGWvtsuRMSOhA09MBC8rn1_pXW-ML8i8_xvkrU,9410
+cryptodatahub/tls/algorithm.py,sha256=_ftSriQW8EQSjAthcahC8Ra4Ymzu-LXdezrW6QrGSS4,9430
 cryptodatahub/tls/certificate-compression-algorithm.json,sha256=32se6aJWmzPQzwbaLv3ftwKnltUc37xadto8SRrDndk,224
-cryptodatahub/tls/cipher-kind.json,sha256=3KohtbuOQjnyHn7rHNwk7jxgirplvu_DUd_SZ1aLSdg,5488
+cryptodatahub/tls/cipher-kind.json,sha256=Dj1dIrsCseG87N7i9RmioGMV_1mvtifWAgFMcgTbrjQ,5490
 cryptodatahub/tls/cipher-suite-extension.json,sha256=EZO5gDsONRt-TlvZjI8CRicy4YBeBjEOk9E1HknQ-d8,189
 cryptodatahub/tls/cipher-suite.json,sha256=NK9pP6kTAmubtAIJU-rMUCMRzGSdGiEnyKcG5BJbp-k,175449
 cryptodatahub/tls/client.json,sha256=TwTOy_790iRJTLiLiu99r7PBe4dHjU3hDoXtd2bL658,139669
-cryptodatahub/tls/client.py,sha256=x0Q3gYX_Wc6jns3YbE42ASvzfYR9A8vslcdojMRPUdM,7997
+cryptodatahub/tls/client.py,sha256=m0-klm_XpEAqCDZoasCOO82XKc74BTXdOgM5qOXg5hM,8062
 cryptodatahub/tls/compression-method.json,sha256=YV4tPN6V8puhZLCdVoBCezq7T1gzw-luRJhJeCog5mo,411
 cryptodatahub/tls/ec-point-format.json,sha256=bPsbdb_GktNQZBpRlD5Fj9OWQ-dLyNS7A-OwgbPWtLw,473
 cryptodatahub/tls/extension-type.json,sha256=UYrn4yoMb70Ph-x5A9Ap7Bs_ccVm-fhFVnfTsiMw0OE,7060
@@ -62,8 +62,8 @@ cryptodatahub/tls/psk-key-exchange-mode.json,sha256=niv5NXm2e4yIQW3kTzXDhmSi-HsL
 cryptodatahub/tls/token-binding-paramater.json,sha256=OtlzCxg-J9xZjGtTMGsK9sPMiGz9mfNYYmKx8GIQDgE,239
 cryptodatahub/tls/version.json,sha256=7iSBtC50HfZ1xJ05laYZmFOn4xCvU2hKZRf0Ce1N-Bg,3296
 cryptodatahub/tls/version.py,sha256=k5DBZJGK9cqSCeCWBfLC-CSyMk7m6p0Q-ZgpfN2TiuE,411
-CryptoDataHub-0.11.1.dist-info/LICENSE.txt,sha256=-rPda9qyJvHAhjCx3ZF-Efy07F4eAg4sFvg6ChOGPoU,16726
-CryptoDataHub-0.11.1.dist-info/METADATA,sha256=E4Ym_8j_cOcukX-w7tT2uX3Y2dwlkAqJxWexL7aWEQU,3946
-CryptoDataHub-0.11.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-CryptoDataHub-0.11.1.dist-info/top_level.txt,sha256=1pwZYk77PJ6OfV8Bpvn3CSoT7o34ZtT7Dk2DbH_rUSU,14
-CryptoDataHub-0.11.1.dist-info/RECORD,,
+CryptoDataHub-0.12.1.dist-info/LICENSE.txt,sha256=-rPda9qyJvHAhjCx3ZF-Efy07F4eAg4sFvg6ChOGPoU,16726
+CryptoDataHub-0.12.1.dist-info/METADATA,sha256=dhw73_wrbCLhdqim9sEa0hKH01R6J85Q01wOrQezm28,3946
+CryptoDataHub-0.12.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+CryptoDataHub-0.12.1.dist-info/top_level.txt,sha256=1pwZYk77PJ6OfV8Bpvn3CSoT7o34ZtT7Dk2DbH_rUSU,14
+CryptoDataHub-0.12.1.dist-info/RECORD,,

{CryptoDataHub-0.11.1.dist-info → CryptoDataHub-0.12.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

cryptodatahub/__setup__.py

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

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/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/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/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/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/common/key-exchange.json

@@ -128,7 +128,7 @@
     "HYBRID_PQS": {
         "name": "hybrid post-quantum safe",
         "long_name": null,
-        "vulnerabilities": null,
+        "vulnerabilities": [],
         "forward_secret": true
     },
     "SRP": {

cryptodatahub/common/key.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import abc
-import hashlib
 import base64
 import collections
 import datetime
@@ -26,7 +25,7 @@ from cryptodatahub.common.grade import (
     Vulnerability,
 )
 from cryptodatahub.common.types import _ConverterBase
-from cryptodatahub.common.utils import bytes_to_hex_string
+from cryptodatahub.common.utils import bytes_to_hex_string, hash_bytes
 
 from cryptodatahub.tls.algorithm import TlsExtensionType
 
@@ -38,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]
@@ -79,6 +78,8 @@ class PublicKeySize(GradeableComplex):
                     Vulnerability(attack_type=AttackType.DOS_ATTACK, grade=Grade.WEAK, named=AttackNamed.DHEAT_ATTACK)
                 )
             gradeables = [_PublicKeySizeGradeable(gradeables)]
+        elif self.key_type == KeyExchange.HYBRID_PQS:
+            gradeables = []
         else:
             gradeables = None
 
@@ -109,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))
@@ -122,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))
@@ -142,26 +143,20 @@ 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):
-    _HASHLIB_FUNCS = {
-        Hash.MD5: hashlib.md5,
-        Hash.SHA1: hashlib.sha1,
-        Hash.SHA2_256: hashlib.sha256
-    }
-
     _public_key = attr.ib(validator=attr.validators.instance_of(asn1crypto.keys.PublicKeyInfo))
 
     @classmethod
@@ -317,17 +312,11 @@ class PublicKey(object):
     def key_bytes(self):
         return PublicKey.der.fget(self)
 
-    @classmethod
-    def get_digest(cls, hash_type, key_bytes):
-        try:
-            hashlib_funcs = cls._HASHLIB_FUNCS[hash_type]
-        except KeyError as e:
-            six.raise_from(NotImplementedError(hash_type), e)
-
-        return hashlib_funcs(key_bytes).digest()
+    def get_digest(self, hash_type):
+        return hash_bytes(hash_type, self.der)
 
     def fingerprint(self, hash_type):
-        return bytes_to_hex_string(self.get_digest(hash_type, self.der), ':')
+        return bytes_to_hex_string(self.get_digest(hash_type), ':')
 
     @property
     def fingerprints(self):
@@ -374,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', ),
@@ -435,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):
@@ -472,7 +461,7 @@ class PublicKeyX509Base(PublicKeySigned):  # pylint: disable=too-many-public-met
 
     @property
     def public_key_pin(self):
-        return base64.b64encode(self.get_digest(Hash.SHA2_256, self.key_bytes)).decode('ascii')
+        return base64.b64encode(hash_bytes(Hash.SHA2_256, self.key_bytes)).decode('ascii')
 
     def _has_any_policy_value(self, oid_values):
         if self._certificate.certificate_policies_value is None:

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/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),

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/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(),
@@ -281,9 +287,7 @@ class RootCertificateBase(CryptoDataEnumBase):
     def get_item_by_sha2_256_fingerprint(cls, fingerprint_value):
         if not hasattr(cls, '_ITEMS_BY_SHA2_256_HASH'):
             cls._ITEMS_BY_SHA2_256_HASH = {
-                bytes_to_hex_string(
-                    item.value.certificate.get_digest(Hash.SHA2_256, item.value.certificate.der)
-                ): item
+                bytes_to_hex_string(item.value.certificate.get_digest(Hash.SHA2_256)): item
                 for item in cls
             }