diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-05-26 03:46:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 03:46:24 -0700 |
| commit | 66391b0c6e792236b9f487283ae161bdaf0e7ad7 (patch) | |
| tree | 7a56c5637f3cd0fcd5de3a74f1fb586b02911de3 | |
| parent | cc0f50d62c75a1d171f5de9b56caef64e79eb013 (diff) | |
| download | cpython-git-66391b0c6e792236b9f487283ae161bdaf0e7ad7.tar.gz | |
bpo-40637: Fix test_pbkdf2_hmac_py for missing sha1 (GH-20422)
(cherry picked from commit be63019ed726b2da045bf232782062830bb6c27d)
Co-authored-by: Christian Heimes <christian@python.org>
| -rw-r--r-- | Lib/test/test_hashlib.py | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index d40acd5889..6088307f84 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -1004,17 +1004,31 @@ class KDFTests(unittest.TestCase): self.assertEqual(out, expected, (digest_name, password, salt, rounds)) - self.assertRaises(TypeError, pbkdf2, b'sha1', b'pass', b'salt', 1) - self.assertRaises(TypeError, pbkdf2, 'sha1', 'pass', 'salt', 1) - self.assertRaises(ValueError, pbkdf2, 'sha1', b'pass', b'salt', 0) - self.assertRaises(ValueError, pbkdf2, 'sha1', b'pass', b'salt', -1) - self.assertRaises(ValueError, pbkdf2, 'sha1', b'pass', b'salt', 1, 0) - self.assertRaises(ValueError, pbkdf2, 'sha1', b'pass', b'salt', 1, -1) with self.assertRaisesRegex(ValueError, 'unsupported hash type'): pbkdf2('unknown', b'pass', b'salt', 1) - out = pbkdf2(hash_name='sha1', password=b'password', salt=b'salt', - iterations=1, dklen=None) - self.assertEqual(out, self.pbkdf2_results['sha1'][0][0]) + + if 'sha1' in supported: + self.assertRaises( + TypeError, pbkdf2, b'sha1', b'pass', b'salt', 1 + ) + self.assertRaises( + TypeError, pbkdf2, 'sha1', 'pass', 'salt', 1 + ) + self.assertRaises( + ValueError, pbkdf2, 'sha1', b'pass', b'salt', 0 + ) + self.assertRaises( + ValueError, pbkdf2, 'sha1', b'pass', b'salt', -1 + ) + self.assertRaises( + ValueError, pbkdf2, 'sha1', b'pass', b'salt', 1, 0 + ) + self.assertRaises( + ValueError, pbkdf2, 'sha1', b'pass', b'salt', 1, -1 + ) + out = pbkdf2(hash_name='sha1', password=b'password', salt=b'salt', + iterations=1, dklen=None) + self.assertEqual(out, self.pbkdf2_results['sha1'][0][0]) def test_pbkdf2_hmac_py(self): self._test_pbkdf2_hmac(py_hashlib.pbkdf2_hmac, builtin_hashes) |