mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-91069: do not disable `sha3` in `test_hashlib` under UBSan (#133001)

This commit is contained in:
Bénédikt Tran 2025-04-27 11:51:00 +02:00 committed by GitHub
parent 4f18916c5c
commit cc05e4b867
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Lib/test/test_hashlib.py
View File

@ -62,10 +62,12 @@ def get_fips_mode():
requires_blake2 = unittest.skipUnless(_blake2, 'requires _blake2') requires_blake2 = unittest.skipUnless(_blake2, 'requires _blake2')
# bpo-46913: Don't test the _sha3 extension on a Python UBSAN build try:
# TODO(gh-99108): Revisit this after _sha3 uses HACL*. import _sha3
SKIP_SHA3 = support.check_sanitizer(ub=True) except ImportError:
requires_sha3 = unittest.skipUnless(not SKIP_SHA3, 'requires _sha3') _sha3 = None
requires_sha3 = unittest.skipUnless(_sha3, 'requires _sha3')
def hexstr(s): def hexstr(s):
@ -132,8 +134,6 @@ def __init__(self, *args, **kwargs):
self.constructors_to_test = {} self.constructors_to_test = {}
for algorithm in algorithms: for algorithm in algorithms:
if SKIP_SHA3 and algorithm.startswith('sha3_'):
continue
self.constructors_to_test[algorithm] = set() self.constructors_to_test[algorithm] = set()
# For each algorithm, test the direct constructor and the use # For each algorithm, test the direct constructor and the use
@ -180,20 +180,18 @@ def add_builtin_constructor(name):
add_builtin_constructor('sha256') add_builtin_constructor('sha256')
add_builtin_constructor('sha384') add_builtin_constructor('sha384')
add_builtin_constructor('sha512') add_builtin_constructor('sha512')
_sha3 = self._conditional_import_module('_sha3')
if _sha3:
add_builtin_constructor('sha3_224')
add_builtin_constructor('sha3_256')
add_builtin_constructor('sha3_384')
add_builtin_constructor('sha3_512')
add_builtin_constructor('shake_128')
add_builtin_constructor('shake_256')
if _blake2: if _blake2:
add_builtin_constructor('blake2s') add_builtin_constructor('blake2s')
add_builtin_constructor('blake2b') add_builtin_constructor('blake2b')
if not SKIP_SHA3:
_sha3 = self._conditional_import_module('_sha3')
if _sha3:
add_builtin_constructor('sha3_224')
add_builtin_constructor('sha3_256')
add_builtin_constructor('sha3_384')
add_builtin_constructor('sha3_512')
add_builtin_constructor('shake_128')
add_builtin_constructor('shake_256')
super(HashLibTestCase, self).__init__(*args, **kwargs) super(HashLibTestCase, self).__init__(*args, **kwargs)
@property @property