From 7bdbd1c67e5d113eab18d4aac1112321f467ca68 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 22 Mar 2022 14:05:57 +0100 Subject: [PATCH 1/2] bpo-45150: Fix testing under FIPS mode --- Lib/test/test_hashlib.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index daf6e3862a24f7..f0a66e40c49a11 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -379,7 +379,14 @@ def check(self, name, data, hexdigest, shake=False, **kwargs): def check_file_digest(self, name, data, hexdigest): hexdigest = hexdigest.lower() - digests = [name] + digests = [] + try: + hashlib.new(name) + except ValueError: + # algorithm is blocked by security policy. + pass + else: + digests.append(name) digests.extend(self.constructors_to_test[name]) with open(os_helper.TESTFN, "wb") as f: From 11e0d1aa988297b09c17bddf8e1cc9913ef7a73e Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 22 Mar 2022 15:10:55 +0100 Subject: [PATCH 2/2] Skip harder --- Lib/test/test_hashlib.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index f0a66e40c49a11..369bbde6e78b6d 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -379,14 +379,12 @@ def check(self, name, data, hexdigest, shake=False, **kwargs): def check_file_digest(self, name, data, hexdigest): hexdigest = hexdigest.lower() - digests = [] try: hashlib.new(name) except ValueError: - # algorithm is blocked by security policy. - pass - else: - digests.append(name) + # skip, algorithm is blocked by security policy. + return + digests = [name] digests.extend(self.constructors_to_test[name]) with open(os_helper.TESTFN, "wb") as f: