diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-06-11 13:18:56 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-06-11 13:18:56 -0700 |
| commit | 5a991226e84e935f2a50deec664eaf3860893354 (patch) | |
| tree | e674175fd5bc642be83ceb674d57e303b26f4326 /Lib/test/test_hashlib.py | |
| parent | 9997d0207649b71b5862d3c036c1f7dcacf4f7b1 (diff) | |
| parent | 1ccde8e1ad13ea6943f6ef5ea4329c9827ba493e (diff) | |
| download | cpython-5a991226e84e935f2a50deec664eaf3860893354.tar.gz | |
merge 3.4
Diffstat (limited to 'Lib/test/test_hashlib.py')
| -rw-r--r-- | Lib/test/test_hashlib.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 85ec2f96db..c9b113e6ef 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -449,7 +449,7 @@ class KDFTests(unittest.TestCase): pbkdf2_results = { "sha1": [ - # offical test vectors from RFC 6070 + # official test vectors from RFC 6070 (bytes.fromhex('0c60c80f961f0e71f3a9b524af6012062fe037a6'), None), (bytes.fromhex('ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957'), None), (bytes.fromhex('4b007901b765489abead49d926f721d065a429c1'), None), @@ -513,6 +513,9 @@ class KDFTests(unittest.TestCase): 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]) def test_pbkdf2_hmac_py(self): self._test_pbkdf2_hmac(py_hashlib.pbkdf2_hmac) |