diff options
| author | Paul McMillan <paul.mcmillan@nebula.com> | 2013-09-19 17:39:43 +0100 |
|---|---|---|
| committer | Paul McMillan <paul.mcmillan@nebula.com> | 2013-09-19 18:02:25 +0100 |
| commit | a075e2ad0dcce65cb5cf4cb654ac8a6839db0baf (patch) | |
| tree | 5116a0aade0ddaa229de4b99e84a49f73202b37c /django/contrib | |
| parent | 59a34c43a8c3d62eaa400d48a9c26ed5400fc647 (diff) | |
Increase default PBKDF2 iterations
Increases the default PBKDF2 iterations, since computers have gotten
faster since 2011. In the future, we plan to increment by 10% per
major version.
Diffstat (limited to 'django/contrib')
| -rw-r--r-- | django/contrib/auth/hashers.py | 4 | ||||
| -rw-r--r-- | django/contrib/auth/tests/test_hashers.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index fdf3b1b3b4..5c41b0240c 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -231,12 +231,12 @@ class PBKDF2PasswordHasher(BasePasswordHasher): """ Secure password hashing using the PBKDF2 algorithm (recommended) - Configured to use PBKDF2 + HMAC + SHA256 with 10000 iterations. + Configured to use PBKDF2 + HMAC + SHA256 with 12000 iterations. The result is a 64 byte binary string. Iterations may be changed safely but you must rename the algorithm if you change SHA256. """ algorithm = "pbkdf2_sha256" - iterations = 10000 + iterations = 12000 digest = hashlib.sha256 @password_max_length(MAXIMUM_PASSWORD_LENGTH) diff --git a/django/contrib/auth/tests/test_hashers.py b/django/contrib/auth/tests/test_hashers.py index 51cb0b277b..324559de45 100644 --- a/django/contrib/auth/tests/test_hashers.py +++ b/django/contrib/auth/tests/test_hashers.py @@ -52,7 +52,7 @@ class TestUtilsHashPass(unittest.TestCase): def test_pkbdf2(self): encoded = make_password('lètmein', 'seasalt', 'pbkdf2_sha256') self.assertEqual(encoded, - 'pbkdf2_sha256$10000$seasalt$CWWFdHOWwPnki7HvkcqN9iA2T3KLW1cf2uZ5kvArtVY=') + 'pbkdf2_sha256$12000$seasalt$Ybw8zsFxqja97tY/o6G+Fy1ksY4U/Hw3DRrGED6Up4s=') self.assertTrue(is_password_usable(encoded)) self.assertTrue(check_password('lètmein', encoded)) self.assertFalse(check_password('lètmeinz', encoded)) @@ -284,16 +284,16 @@ class TestUtilsHashPass(unittest.TestCase): def test_low_level_pkbdf2(self): hasher = PBKDF2PasswordHasher() - encoded = hasher.encode('lètmein', 'seasalt') + encoded = hasher.encode('lètmein', 'seasalt2') self.assertEqual(encoded, - 'pbkdf2_sha256$10000$seasalt$CWWFdHOWwPnki7HvkcqN9iA2T3KLW1cf2uZ5kvArtVY=') + 'pbkdf2_sha256$12000$seasalt2$hlDLKsxgkgb1aeOppkM5atCYw5rPzAjCNQZ4NYyUROw=') self.assertTrue(hasher.verify('lètmein', encoded)) def test_low_level_pbkdf2_sha1(self): hasher = PBKDF2SHA1PasswordHasher() - encoded = hasher.encode('lètmein', 'seasalt') + encoded = hasher.encode('lètmein', 'seasalt2') self.assertEqual(encoded, - 'pbkdf2_sha1$10000$seasalt$oAfF6vgs95ncksAhGXOWf4Okq7o=') + 'pbkdf2_sha1$12000$seasalt2$JeMRVfjjgtWw3/HzlnlfqBnQ6CA=') self.assertTrue(hasher.verify('lètmein', encoded)) def test_upgrade(self): |