Skip to content

Commit 622dea0

Browse files
committed
gh-134696: fix hashlib tests for FIPS-only BLAKE-2 buildbot (#134968)
1 parent 8235738 commit 622dea0

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

Lib/test/test_hashlib.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,25 @@ def test_usedforsecurity_false(self):
250250
self._hashlib.new("md5", usedforsecurity=False)
251251
self._hashlib.openssl_md5(usedforsecurity=False)
252252

253+
@unittest.skipIf(get_fips_mode(), "skip in FIPS mode")
253254
def test_clinic_signature(self):
254255
for constructor in self.hash_constructors:
255256
with self.subTest(constructor.__name__):
256257
constructor(b'')
257258
constructor(data=b'')
258259
constructor(string=b'') # should be deprecated in the future
259260

261+
digest_name = constructor(b'').name
262+
with self.subTest(digest_name):
263+
hashlib.new(digest_name, b'')
264+
hashlib.new(digest_name, data=b'')
265+
hashlib.new(digest_name, string=b'')
266+
if self._hashlib:
267+
self._hashlib.new(digest_name, b'')
268+
self._hashlib.new(digest_name, data=b'')
269+
self._hashlib.new(digest_name, string=b'')
270+
271+
@unittest.skipIf(get_fips_mode(), "skip in FIPS mode")
260272
def test_clinic_signature_errors(self):
261273
nomsg = b''
262274
mymsg = b'msg'
@@ -296,9 +308,16 @@ def test_clinic_signature_errors(self):
296308
[(), dict(data=nomsg, string=nomsg), conflicting_call],
297309
]:
298310
for constructor in self.hash_constructors:
311+
digest_name = constructor(b'').name
299312
with self.subTest(constructor.__name__, args=args, kwds=kwds):
300313
with self.assertRaisesRegex(TypeError, errmsg):
301314
constructor(*args, **kwds)
315+
with self.subTest(digest_name, args=args, kwds=kwds):
316+
with self.assertRaisesRegex(TypeError, errmsg):
317+
hashlib.new(digest_name, *args, **kwds)
318+
if self._hashlib:
319+
with self.assertRaisesRegex(TypeError, errmsg):
320+
self._hashlib.new(digest_name, *args, **kwds)
302321

303322
def test_unknown_hash(self):
304323
self.assertRaises(ValueError, hashlib.new, 'spam spam spam spam spam')

0 commit comments

Comments
 (0)