use 'defining_class' when copying HACL*-based hashes

Author: picnixz

Lib/test/test_hashlib.py

@@ -216,6 +216,24 @@ def shake_constructors(self):
     def is_fips_mode(self):
         return get_fips_mode()
 
+    def match_digest(self, h1, h2, *, shake_size=16):
+        self.assertIs(type(h1), type(h2))
+        self.assertEqual(h1.name, h2.name)
+
+        if h1.name in self.shakes:
+            d1, h1 = h1.digest(shake_size), h1.hexdigest(shake_size)
+            d2, h2 = h2.digest(shake_size), h2.hexdigest(shake_size)
+        else:
+            d1, h1 = h1.digest(), h1.hexdigest()
+            d2, h2 = h2.digest(), h2.hexdigest()
+
+        self.assertIsInstance(d1, bytes)
+        self.assertIsInstance(h1, str)
+        self.assertEqual(d1.hex(), h1)
+
+        self.assertEqual(d1, d2)
+        self.assertEqual(h1, h2)
+
     def test_hash_array(self):
         a = array.array("b", range(10))
         for cons in self.hash_constructors:
@@ -371,6 +389,14 @@ def test_get_builtin_constructor(self):
         self.assertIs(constructor, _md5.md5)
         self.assertEqual(sorted(builtin_constructor_cache), ['MD5', 'md5'])
 
+    def test_copy(self):
+        for cons in self.hash_constructors:
+            h1 = cons(usedforsecurity=False)
+            h1.update(os.urandom(16))
+            h2 = h1.copy()
+            self.assertIs(type(h1), type(h2))
+            self.match_digest(h1, h2)
+
     def test_hexdigest(self):
         for cons in self.hash_constructors:
             h = cons(usedforsecurity=False)

Modules/blake2module.c

@@ -787,17 +787,19 @@ blake2_blake2b_copy_unlocked(Blake2Object *self, Blake2Object *cpy)
 /*[clinic input]
 _blake2.blake2b.copy
 
+    cls: defining_class
+
 Return a copy of the hash object.
 [clinic start generated code]*/
 
 static PyObject *
-_blake2_blake2b_copy_impl(Blake2Object *self)
-/*[clinic end generated code: output=622d1c56b91c50d8 input=e383c2d199fd8a2e]*/
+_blake2_blake2b_copy_impl(Blake2Object *self, PyTypeObject *cls)
+/*[clinic end generated code: output=5f8ea31c56c52287 input=f38f3475e9aec98d]*/
 {
     int rc;
     Blake2Object *cpy;
 
-    if ((cpy = new_Blake2Object(Py_TYPE(self))) == NULL) {
+    if ((cpy = new_Blake2Object(cls)) == NULL) {
         return NULL;
     }
 

Modules/clinic/blake2module.c.h

@@ -239,16 +239,17 @@ SHA3_traverse(PyObject *self, visitproc visit, void *arg)
 /*[clinic input]
 _sha3.sha3_224.copy
 
+    cls: defining_class
+
 Return a copy of the hash object.
 [clinic start generated code]*/
 
 static PyObject *
-_sha3_sha3_224_copy_impl(SHA3object *self)
-/*[clinic end generated code: output=6c537411ecdcda4c input=93a44aaebea51ba8]*/
+_sha3_sha3_224_copy_impl(SHA3object *self, PyTypeObject *cls)
+/*[clinic end generated code: output=13958b44c244013e input=7134b4dc0a2fbcac]*/
 {
     SHA3object *newobj;
-
-    if ((newobj = newSHA3object(Py_TYPE(self))) == NULL) {
+    if ((newobj = newSHA3object(cls)) == NULL) {
         return NULL;
     }
     HASHLIB_ACQUIRE_LOCK(self);