diff options
| author | Tim Graham <timograham@gmail.com> | 2018-05-13 20:06:20 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-05-13 20:06:20 -0400 |
| commit | cae010728763e0e716b87f4ccd8b3fa54eb20602 (patch) | |
| tree | b84eb0575e488da7e84c1bd3a46bc4fab154efb4 | |
| parent | 31ce1f74334add625a4ed82b531d769828237882 (diff) | |
| download | django-cae010728763e0e716b87f4ccd8b3fa54eb20602.tar.gz | |
Increased the default PBKDF2 iterations for Django 2.1.
| -rw-r--r-- | django/contrib/auth/hashers.py | 2 | ||||
| -rw-r--r-- | tests/auth_tests/test_hashers.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index 75664836dc..55568de6d6 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -236,7 +236,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher): safely but you must rename the algorithm if you change SHA256. """ algorithm = "pbkdf2_sha256" - iterations = 100000 + iterations = 120000 digest = hashlib.sha256 def encode(self, password, salt, iterations=None): diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py index ab34ad78b6..639ddbb1cf 100644 --- a/tests/auth_tests/test_hashers.py +++ b/tests/auth_tests/test_hashers.py @@ -52,7 +52,7 @@ class TestUtilsHashPass(SimpleTestCase): def test_pbkdf2(self): encoded = make_password('lètmein', 'seasalt', 'pbkdf2_sha256') - self.assertEqual(encoded, 'pbkdf2_sha256$100000$seasalt$BNZ6eyaNc8qFTJPjrAq99hSYb73EgAdytAtdBg2Sdcc=') + self.assertEqual(encoded, 'pbkdf2_sha256$120000$seasalt$fsgWMpOXin7ZAmi4j+7XjKCZ4JCvxJTGiwwDrawRqSc=') self.assertTrue(is_password_usable(encoded)) self.assertTrue(check_password('lètmein', encoded)) self.assertFalse(check_password('lètmeinz', encoded)) @@ -285,13 +285,13 @@ class TestUtilsHashPass(SimpleTestCase): def test_low_level_pbkdf2(self): hasher = PBKDF2PasswordHasher() encoded = hasher.encode('lètmein', 'seasalt2') - self.assertEqual(encoded, 'pbkdf2_sha256$100000$seasalt2$Tl4GMr+Yt1zzO1sbKoUaDBdds5NkR3RxaDWuQsliFrI=') + self.assertEqual(encoded, 'pbkdf2_sha256$120000$seasalt2$FRWVLZaxRXtbVIkhYdTQc/tE7JF/s5tU/4O4VhB94ig=') self.assertTrue(hasher.verify('lètmein', encoded)) def test_low_level_pbkdf2_sha1(self): hasher = PBKDF2SHA1PasswordHasher() encoded = hasher.encode('lètmein', 'seasalt2') - self.assertEqual(encoded, 'pbkdf2_sha1$100000$seasalt2$dK/dL+ySBZ5zoR0+Zk3SB/VsH0U=') + self.assertEqual(encoded, 'pbkdf2_sha1$120000$seasalt2$6kIwMgg3rEEwDAQY/CB9VUVtEiI=') self.assertTrue(hasher.verify('lètmein', encoded)) @override_settings( |