Python: Support extended hash identifiers

Author: rhash

bindings/python/rhash/__init__.py

@@ -44,6 +44,7 @@
     SHA3_512,
     BLAKE2S,
     BLAKE2B,
+    BLAKE3,
     SNEFRU128,
     SNEFRU256,
     RHash,
@@ -91,6 +92,7 @@
     "SHA3_512",
     "BLAKE2S",
     "BLAKE2B",
+    "BLAKE3",
     "SNEFRU128",
     "SNEFRU256",
     "RHash",

bindings/python/rhash/rhash.py

@@ -75,6 +75,7 @@
     c_int,
     c_size_t,
     c_uint,
+    c_ulonglong,
     c_void_p,
     create_string_buffer,
 )
@@ -126,6 +127,13 @@ def _run_rhash_ctrl(ctx, command, count=0, data=0):
         return _LIBRHASH.rhash_transmit(command, ctx, count, data)
 
 
+_HAS_RHASH_UPDATE_FD = hasattr(_LIBRHASH, "rhash_update_fd")
+_HAS_EXTENDED_HASH_IDS = _HAS_RHASH_UPDATE_FD
+if _HAS_RHASH_UPDATE_FD:
+    _LIBRHASH.rhash_update_fd.argtypes = [c_void_p, c_int, c_ulonglong]
+    _LIBRHASH.rhash_ctrl.restype = c_int
+
+
 # conversion of a string to binary data with Python 2/3 compatibility
 if sys.version < "3":
 
@@ -187,7 +195,15 @@ def _msg_to_bytes(msg):
 SNEFRU256 = 0x10000000
 BLAKE2S = 0x20000000
 BLAKE2B = 0x40000000
-ALL = 0x7FFFFFFF
+BLAKE3 = 0x8000001F
+if _HAS_EXTENDED_HASH_IDS:
+    ALL = 0xFF000000
+else:
+    ALL = 0x7FFFFFFF
+
+_LOW_HASH_MASK = 0x7FFFFFFF
+_EXTENDED_BIT = 0x80000000
+_MAX_HASH_COUNT = 256
 
 # four deprecated constants
 SHA224 = 0x10000
@@ -259,7 +275,14 @@ def _are_good_ids(hash_ids):
         for alg_id in hash_ids:
             if not isinstance(alg_id, int) or alg_id <= 0:
                 raise InvalidArgumentError("Invalid value of hash_ids")
-            if (alg_id & ALL) != alg_id or ((alg_id - 1) & alg_id) != 0:
+            if (alg_id & _EXTENDED_BIT) == 0:
+                if ((alg_id - 1) & alg_id) != 0:
+                    return False
+            elif not _HAS_EXTENDED_HASH_IDS:
+                raise InvalidArgumentError(
+                    "Hash_id is not supported by the installed librhash version"
+                )
+            elif (alg_id & _LOW_HASH_MASK) > _MAX_HASH_COUNT:
                 return False
         return True
 
@@ -307,7 +330,7 @@ def _print(self, hash_id, flags):
         size = _LIBRHASH.rhash_print(buf, self._ctx, hash_id, flags)
         if not size:
             raise InvalidArgumentError(
-                "Requested message digest for an invalid hash_id = {}".format(hash_id)
+                "Requested message digest for an unsupported hash_id = {}".format(hash_id)
             )
         if (flags & 3) == _RHPR_RAW:
             return buf[0:size]

bindings/python/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = rhash-Rhash
-version = 1.2
+version = 1.3
 author = Aleksey Kravchenko
 author_email = [email protected]
 description = Python interface for librhash
@@ -10,10 +10,15 @@ url = https://github.com/rhash/RHash
 project_urls =
     Source = https://github.com/rhash/RHash
     Bug Tracker = https://github.com/rhash/RHash/issues
-license = BSD Zero Clause License
+    Documentation = https://github.com/rhash/RHash/tree/master/bindings/python#readme
+license = 0BSD
+license_files = LICENSE
 classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
     Programming Language :: Python :: 3
-    License :: OSI Approved :: BSD License
     Operating System :: OS Independent
 
 [options]

bindings/python/tests/rhash_test.py

@@ -128,6 +128,10 @@ def test_all_hashes(self):
             "d5abe2c6b1b5ee3face62fed78dbef802f2a85cb91d455a8f5249d330853cb3c",
             ctx.hash(rhash.BLAKE2B),
         )
+        self.assertEqual(
+            "17762fddd969a453925d65717ac3eea21320b66b54342fde15128d6caf21215f",
+            ctx.hash(rhash.BLAKE3),
+        )
         # Test reset
         ctx.reset().finish()
         # Verify MD5( "" )