use exposed GIL_MINSIZE constant in tests

Author: picnixz

Lib/test/test_hashlib.py

@@ -20,7 +20,7 @@
 import warnings
 from test import support
 from test.support import _4G, bigmemtest
-from test.support.import_helper import import_fresh_module
+from test.support.import_helper import import_fresh_module, import_module
 from test.support import requires_resource
 from test.support import threading_helper
 from http.client import HTTPException
@@ -95,6 +95,19 @@ def read_vectors(hash_name):
             yield parts
 
 
+def find_gil_minsize(*modules_names, default=2048):
+    gil_minsize = default
+    for module_name in modules_names:
+        if SKIP_SHA3 and module_name == '_sha3':
+            continue
+        try:
+            module = importlib.import_module(module_name)
+        except ImportError:
+            continue
+        gil_minsize = max(gil_minsize, module.GIL_MINSIZE)
+    return gil_minsize
+
+
 class HashLibTestCase(unittest.TestCase):
     supported_hash_names = ( 'md5', 'MD5', 'sha1', 'SHA1',
                              'sha224', 'SHA224', 'sha256', 'SHA256',
@@ -913,9 +926,12 @@ def test_case_shake256_vector(self):
 
     def test_gil(self):
         # Check things work fine with an input larger than the size required
-        # for multithreaded operation (which is hardwired to 2048).
-        gil_minsize = 2048
-
+        # for multithreaded operation. Currently, all cryptographic modules
+        # have the same constant value (2048) but in the future it might not
+        # be the case.
+        gil_minsize = find_gil_minsize(
+            '_md5', '_sha1', '_sha2', '_sha3', '_blake2', '_hashlib',
+        )
         for cons in self.hash_constructors:
             m = cons(usedforsecurity=False)
             m.update(b'1')
@@ -925,6 +941,8 @@ def test_gil(self):
             m = cons(b'x' * gil_minsize, usedforsecurity=False)
             m.update(b'1')
 
+    def test_sha256_gil(self):
+        gil_minsize = find_gil_minsize('_sha2', '_hashlib')
         m = hashlib.sha256()
         m.update(b'1')
         m.update(b'#' * gil_minsize)

Lib/test/test_hmac.py

@@ -1102,6 +1102,11 @@ def HMAC(self, key, msg=None):
         """Create a HMAC object."""
         raise NotImplementedError
 
+    @property
+    def gil_minsize(self):
+        """Get the maximal input length for the GIL to be held."""
+        raise NotImplementedError
+
     def check_update(self, key, chunks):
         chunks = list(chunks)
         msg = b''.join(chunks)
@@ -1120,11 +1125,10 @@ def test_update(self):
             self.check_update(key, [msg])
 
     def test_update_large(self):
-        HASHLIB_GIL_MINSIZE = 2048
-
+        gil_minsize = self.gil_minsize
         key = random.randbytes(16)
-        top = random.randbytes(HASHLIB_GIL_MINSIZE + 1)
-        bot = random.randbytes(HASHLIB_GIL_MINSIZE + 1)
+        top = random.randbytes(gil_minsize + 1)
+        bot = random.randbytes(gil_minsize + 1)
         self.check_update(key, [top, bot])
 
     def test_update_exceptions(self):
@@ -1140,13 +1144,21 @@ class PyUpdateTestCase(PyModuleMixin, UpdateTestCaseMixin, unittest.TestCase):
     def HMAC(self, key, msg=None):
         return self.hmac.HMAC(key, msg, digestmod='sha256')
 
+    @property
+    def gil_minsize(self):
+        self.skipTest("GIL is always held")
+
 
 @hashlib_helper.requires_openssl_hashdigest('sha256')
 class OpenSSLUpdateTestCase(UpdateTestCaseMixin, unittest.TestCase):
 
     def HMAC(self, key, msg=None):
         return _hashlib.hmac_new(key, msg, digestmod='sha256')
 
+    @property
+    def gil_minsize(self):
+        return _hashlib.GIL_MINSIZE
+
 
 class BuiltinUpdateTestCase(BuiltinModuleMixin,
                             UpdateTestCaseMixin, unittest.TestCase):
@@ -1156,6 +1168,10 @@ def HMAC(self, key, msg=None):
         # are still built, making it possible to use SHA-2 hashes.
         return self.hmac.new(key, msg, digestmod='sha256')
 
+    @property
+    def gil_minsize(self):
+        return self.hmac.GIL_MINSIZE
+
 
 class CopyBaseTestCase: