Add the weird legacy blake2256 etc. cases back in.

Signed-off-by: Michael Schlenker <[email protected]>

Author: Michael Schlenker

cyclonedx/model/__init__.py

@@ -420,7 +420,7 @@ def from_composite_str(composite_hash: str) -> 'HashType':
 
                 Valid case insensitive prefixes are:
                 `md5`, `sha1`, `sha256`, `sha384`, `sha512`, `blake2b256`, `blake2b384`, `blake2b512`,
-                `sha3-256`, `sha3-384`, `sha3-512`,
+                `blake2256`, `blake2384`, `blake2512`, `sha3-256`, `sha3-384`, `sha3-512`,
                 `blake3`.
 
         Raises:
@@ -458,6 +458,11 @@ def from_composite_str(composite_hash: str) -> 'HashType':
                 alg=getattr(HashAlgorithm, f'BLAKE2B_{algorithm_prefix[7:]}'),
                 content=parts[1].lower()
             )
+        elif algorithm_prefix[0:6] == 'blake2':
+            return HashType(
+                alg=getattr(HashAlgorithm, f'BLAKE2B_{algorithm_prefix[6:]}'),
+                content=parts[1].lower()
+            )
         elif algorithm_prefix[0:6] == 'blake3':
             return HashType(
                 alg=HashAlgorithm.BLAKE3,

tests/test_model.py

@@ -273,6 +273,12 @@ def test_hash_type_from_hashlib_alg_throws_on_unknown(self) -> None:
          HashAlgorithm.BLAKE2B_512,
          '6d518ac5c7a022e954ecb21b8bf68d7f5c52e3c3579cd96f3bde4f76daaaa69a'
          '96a5eee268fb8fa2745930c37f0672424136b538878474bc4f586a63e13ae23f'),
+        ('blake2512',
+         'blake2512:6d518ac5c7a022e954ecb21b8bf68d7f5c52e3c3579cd96f3bde4'
+         'f76daaaa69a96a5eee268fb8fa2745930c37f0672424136b538878474bc4f586a63e13ae23f',
+         HashAlgorithm.BLAKE2B_512,
+         '6d518ac5c7a022e954ecb21b8bf68d7f5c52e3c3579cd96f3bde4f76daaaa69a'
+         '96a5eee268fb8fa2745930c37f0672424136b538878474bc4f586a63e13ae23f'),
     )
     def test_hash_type_from_composite_str(self, composite: str, e_alg: HashAlgorithm, e_content: str) -> None:
         h = HashType.from_composite_str(composite)