Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-44048: Fix two hashlib test cases under FIPS mode (GH-26470) (GH-26531)

Browse source 
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.
(cherry picked from commit a46c220edc)

Co-authored-by: stratakis <cstratak@redhat.com>

Co-authored-by: stratakis <cstratak@redhat.com>
This commit is contained in:
Miss Islington (bot) 2021-06-04 11:38:02 -07:00 • committed by GitHub
parent e53f72a1b4
commit 3f4d801bf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_hashlib.py
View file

@ -909,7 +909,11 @@ def test_disallow_instantiation(self):
continue continue
# all other types have DISALLOW_INSTANTIATION # all other types have DISALLOW_INSTANTIATION
for constructor in constructors: for constructor in constructors:
# In FIPS mode some algorithms are not available raising ValueError
try:
h = constructor() h = constructor()
except ValueError:
continue
with self.subTest(constructor=constructor): with self.subTest(constructor=constructor):
hash_type = type(h) hash_type = type(h)
self.assertRaises(TypeError, hash_type) self.assertRaises(TypeError, hash_type)
@ -930,7 +934,11 @@ def test_readonly_types(self):
for algorithm, constructors in self.constructors_to_test.items(): for algorithm, constructors in self.constructors_to_test.items():
# all other types have DISALLOW_INSTANTIATION # all other types have DISALLOW_INSTANTIATION
for constructor in constructors: for constructor in constructors:
# In FIPS mode some algorithms are not available raising ValueError
try:
hash_type = type(constructor()) hash_type = type(constructor())
except ValueError:
continue
with self.subTest(hash_type=hash_type): with self.subTest(hash_type=hash_type):
with self.assertRaisesRegex(TypeError, "immutable type"): with self.assertRaisesRegex(TypeError, "immutable type"):
hash_type.value = False hash_type.value = False