update

Author: picnixz

Lib/test/support/hashlib_helper.py

@@ -1,5 +1,6 @@
 import functools
 import hashlib
+import importlib
 import unittest
 from test.support.import_helper import import_module
 
@@ -100,3 +101,22 @@ def wrapper(*args, **kwargs):
     def decorator(func_or_class):
         return _decorate_func_or_class(func_or_class, decorator_func)
     return decorator
+
+
+def find_gil_minsize(modules_names, default=2048):
+    """Get the largest GIL_MINSIZE value for the given cryptographic modules.
+
+    The valid module names are the following:
+
+    - _hashlib
+    - _md5, _sha1, _sha2, _sha3, _blake2
+    - _hmac
+    """
+    sizes = []
+    for module_name in modules_names:
+        try:
+            module = importlib.import_module(module_name)
+        except ImportError:
+            continue
+        sizes.append(getattr(module, '_GIL_MINSIZE', default))
+    return max(sizes, default=default)

Lib/test/test_hashlib.py

@@ -21,7 +21,7 @@
 from test import support
 from test.support import _4G, bigmemtest
 from test.support import hashlib_helper
-from test.support.import_helper import import_fresh_module, import_module
+from test.support.import_helper import import_fresh_module
 from test.support import requires_resource
 from test.support import threading_helper
 from http.client import HTTPException
@@ -96,19 +96,6 @@ def read_vectors(hash_name):
             yield parts
 
 
-def find_gil_minsize(*modules_names, default=2048):
-    sizes = []
-    for module_name in modules_names:
-        if SKIP_SHA3 and module_name == '_sha3':
-            continue
-        try:
-            module = importlib.import_module(module_name)
-        except ImportError:
-            continue
-        sizes.append(module._GIL_MINSIZE)
-    return max(sizes, default=default)
-
-
 class HashLibTestCase(unittest.TestCase):
     supported_hash_names = ( 'md5', 'MD5', 'sha1', 'SHA1',
                              'sha224', 'SHA224', 'sha256', 'SHA256',
@@ -930,10 +917,10 @@ def test_gil(self):
         # 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',
-        )
+        mods = ['_md5', '_sha1', '_sha2', '_sha3', '_blake2', '_hashlib']
+        gil_minsize = hashlib_helper.find_gil_minsize(mods)
         for cons in self.hash_constructors:
+            # constructors belong to one of the above modules
             m = cons(usedforsecurity=False)
             m.update(b'1')
             m.update(b'#' * gil_minsize)
@@ -943,7 +930,7 @@ def test_gil(self):
             m.update(b'1')
 
     def test_sha256_gil(self):
-        gil_minsize = find_gil_minsize('_sha2', '_hashlib')
+        gil_minsize = hashlib_helper.find_gil_minsize(['_sha2', '_hashlib'])
         m = hashlib.sha256()
         m.update(b'1')
         m.update(b'#' * gil_minsize)