]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-44048: Fix two hashlib test cases under FIPS mode (GH-26470)
authorstratakis <cstratak@redhat.com>
Fri, 4 Jun 2021 16:47:59 +0000 (18:47 +0200)
committerGitHub <noreply@github.com>
Fri, 4 Jun 2021 16:47:59 +0000 (17:47 +0100)
test_disallow_instantiation and test_readonly_types try to test all the available
digests, however under FIPS mode, while the algorithms are available, trying to use
them will fail with a ValueError.

Lib/test/test_hashlib.py

index e419b388460dcd925a509eb24e7514587f0a3c33..1623bf350e28755b78058afb8fac93cfae796cff 100644 (file)
@@ -909,7 +909,11 @@ class HashLibTestCase(unittest.TestCase):
                 continue
             # all other types have DISALLOW_INSTANTIATION
             for constructor in constructors:
-                h = constructor()
+                # In FIPS mode some algorithms are not available raising ValueError
+                try:
+                    h = constructor()
+                except ValueError:
+                    continue
                 with self.subTest(constructor=constructor):
                     support.check_disallow_instantiation(self, type(h))
 
@@ -923,7 +927,11 @@ class HashLibTestCase(unittest.TestCase):
         for algorithm, constructors in self.constructors_to_test.items():
             # all other types have DISALLOW_INSTANTIATION
             for constructor in constructors:
-                hash_type = type(constructor())
+                # In FIPS mode some algorithms are not available raising ValueError
+                try:
+                    hash_type = type(constructor())
+                except ValueError:
+                    continue
                 with self.subTest(hash_type=hash_type):
                     with self.assertRaisesRegex(TypeError, "immutable type"):
                         hash_type.value = False