mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-128192: mark new tests with skips based on hashlib algorithm availability (gh-128324)

Browse source 
Puts the _hashlib get_fips_mode logic check into test.support rather than spreading it out among other tests.
This commit is contained in:
Gregory P. Smith 2024-12-28 22:32:32 -08:00 • committed by GitHub
parent c9159b7436
commit ffece5590e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/support/__init__.py
View file

@ -2969,3 +2969,11 @@ def run_yielding_async_fn(async_fn, /, *args, **kwargs):
return e.value return e.value
finally: finally:
coro.close() coro.close()
def is_libssl_fips_mode():
try:
from _hashlib import get_fips_mode # ask _hashopenssl.c
except ImportError:
return False # more of a maybe, unless we add this to the _ssl module.
return get_fips_mode() != 0

12
Lib/test/test_urllib2.py
View file

@ -27,6 +27,7 @@ from urllib.parse import urlsplit
import urllib.error import urllib.error
import http.client import http.client
support.requires_working_socket(module=True) support.requires_working_socket(module=True)
# XXX # XXX
@ -1963,20 +1964,29 @@ class MiscTests(unittest.TestCase):
self.assertRaises(ValueError, _parse_proxy, 'file:/ftp.example.com'), self.assertRaises(ValueError, _parse_proxy, 'file:/ftp.example.com'),
class TestDigestAlgorithms(unittest.TestCase): skip_libssl_fips_mode = unittest.skipIf(
support.is_libssl_fips_mode(),
"conservative skip due to OpenSSL FIPS mode possible algorithm nerfing",
)
class TestDigestAuthAlgorithms(unittest.TestCase):
def setUp(self): def setUp(self):
self.handler = AbstractDigestAuthHandler() self.handler = AbstractDigestAuthHandler()
@skip_libssl_fips_mode
def test_md5_algorithm(self): def test_md5_algorithm(self):
H, KD = self.handler.get_algorithm_impls('MD5') H, KD = self.handler.get_algorithm_impls('MD5')
self.assertEqual(H("foo"), "acbd18db4cc2f85cedef654fccc4a4d8") self.assertEqual(H("foo"), "acbd18db4cc2f85cedef654fccc4a4d8")
self.assertEqual(KD("foo", "bar"), "4e99e8c12de7e01535248d2bac85e732") self.assertEqual(KD("foo", "bar"), "4e99e8c12de7e01535248d2bac85e732")
@skip_libssl_fips_mode
def test_sha_algorithm(self): def test_sha_algorithm(self):
H, KD = self.handler.get_algorithm_impls('SHA') H, KD = self.handler.get_algorithm_impls('SHA')
self.assertEqual(H("foo"), "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33") self.assertEqual(H("foo"), "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33")
self.assertEqual(KD("foo", "bar"), "54dcbe67d21d5eb39493d46d89ae1f412d3bd6de") self.assertEqual(KD("foo", "bar"), "54dcbe67d21d5eb39493d46d89ae1f412d3bd6de")
@skip_libssl_fips_mode
def test_sha256_algorithm(self): def test_sha256_algorithm(self):
H, KD = self.handler.get_algorithm_impls('SHA-256') H, KD = self.handler.get_algorithm_impls('SHA-256')
self.assertEqual(H("foo"), "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae") self.assertEqual(H("foo"), "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae")