Skip to content

Commit 6857198

Browse files
authored
bpo-37630: Do not skip the sha3 tests in case of missing builtin sha3 module (GH-20986)
Since we can use now the sha3 and shake algorithms from OpenSSL, we shouldn't skip the tests in case the builtin algorithm was not compiled or removed.
1 parent 3ab4bea commit 6857198

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

Lib/test/test_hashlib.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,6 @@
6060

6161
requires_blake2 = unittest.skipUnless(_blake2, 'requires _blake2')
6262

63-
try:
64-
import _sha3
65-
except ImportError:
66-
_sha3 = None
67-
68-
requires_sha3 = unittest.skipUnless(_sha3, 'requires _sha3')
69-
7063

7164
def hexstr(s):
7265
assert isinstance(s, bytes), repr(s)
@@ -389,7 +382,6 @@ def test_no_unicode_blake2(self):
389382
self.check_no_unicode('blake2b')
390383
self.check_no_unicode('blake2s')
391384

392-
@requires_sha3
393385
def test_no_unicode_sha3(self):
394386
self.check_no_unicode('sha3_224')
395387
self.check_no_unicode('sha3_256')
@@ -425,7 +417,6 @@ def test_blocksize_name(self):
425417
self.check_blocksize_name('sha384', 128, 48)
426418
self.check_blocksize_name('sha512', 128, 64)
427419

428-
@requires_sha3
429420
def test_blocksize_name_sha3(self):
430421
self.check_blocksize_name('sha3_224', 144, 28)
431422
self.check_blocksize_name('sha3_256', 136, 32)
@@ -446,7 +437,6 @@ def check_sha3(self, name, capacity, rate, suffix):
446437
self.assertEqual(m._rate_bits, rate)
447438
self.assertEqual(m._suffix, suffix)
448439

449-
@requires_sha3
450440
def test_extra_sha3(self):
451441
self.check_sha3('sha3_224', 448, 1152, b'\x06')
452442
self.check_sha3('sha3_256', 512, 1088, b'\x06')
@@ -786,68 +776,56 @@ def test_blake2s_vectors(self):
786776
key = bytes.fromhex(key)
787777
self.check('blake2s', msg, md, key=key)
788778

789-
@requires_sha3
790779
def test_case_sha3_224_0(self):
791780
self.check('sha3_224', b"",
792781
"6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7")
793782

794-
@requires_sha3
795783
def test_case_sha3_224_vector(self):
796784
for msg, md in read_vectors('sha3_224'):
797785
self.check('sha3_224', msg, md)
798786

799-
@requires_sha3
800787
def test_case_sha3_256_0(self):
801788
self.check('sha3_256', b"",
802789
"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a")
803790

804-
@requires_sha3
805791
def test_case_sha3_256_vector(self):
806792
for msg, md in read_vectors('sha3_256'):
807793
self.check('sha3_256', msg, md)
808794

809-
@requires_sha3
810795
def test_case_sha3_384_0(self):
811796
self.check('sha3_384', b"",
812797
"0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2a"+
813798
"c3713831264adb47fb6bd1e058d5f004")
814799

815-
@requires_sha3
816800
def test_case_sha3_384_vector(self):
817801
for msg, md in read_vectors('sha3_384'):
818802
self.check('sha3_384', msg, md)
819803

820-
@requires_sha3
821804
def test_case_sha3_512_0(self):
822805
self.check('sha3_512', b"",
823806
"a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a6"+
824807
"15b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26")
825808

826-
@requires_sha3
827809
def test_case_sha3_512_vector(self):
828810
for msg, md in read_vectors('sha3_512'):
829811
self.check('sha3_512', msg, md)
830812

831-
@requires_sha3
832813
def test_case_shake_128_0(self):
833814
self.check('shake_128', b"",
834815
"7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef26",
835816
True)
836817
self.check('shake_128', b"", "7f9c", True)
837818

838-
@requires_sha3
839819
def test_case_shake128_vector(self):
840820
for msg, md in read_vectors('shake_128'):
841821
self.check('shake_128', msg, md, True)
842822

843-
@requires_sha3
844823
def test_case_shake_256_0(self):
845824
self.check('shake_256', b"",
846825
"46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762f",
847826
True)
848827
self.check('shake_256', b"", "46b9", True)
849828

850-
@requires_sha3
851829
def test_case_shake256_vector(self):
852830
for msg, md in read_vectors('shake_256'):
853831
self.check('shake_256', msg, md, True)

0 commit comments

Comments
 (0)