Skip to content

Commit

Permalink
Increased the default PBKDF2 iterations for Django 6.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahboyce committed Jan 15, 2025
1 parent 7bc88c3 commit 37373d9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion django/contrib/auth/hashers.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher):
"""

algorithm = "pbkdf2_sha256"
iterations = 1_000_000
iterations = 1_200_000
digest = hashlib.sha256

def encode(self, password, salt, iterations=None):
Expand Down
3 changes: 2 additions & 1 deletion docs/releases/6.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ Minor features
:mod:`django.contrib.auth`
~~~~~~~~~~~~~~~~~~~~~~~~~~

* ...
* The default iteration count for the PBKDF2 password hasher is increased from
1,000,000 to 1,200,000.

:mod:`django.contrib.contenttypes`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
10 changes: 5 additions & 5 deletions tests/auth_tests/test_hashers.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ def test_pbkdf2(self):
encoded = make_password("lètmein", "seasalt", "pbkdf2_sha256")
self.assertEqual(
encoded,
"pbkdf2_sha256$1000000$"
"seasalt$r1uLUxoxpP2Ued/qxvmje7UH9PUJBkRrvf9gGPL7Cps=",
"pbkdf2_sha256$1200000$"
"seasalt$6sTlFi4QohxXLuZigqDIUNX8xG9NxrTmV8+flFQdBqE=",
)
self.assertTrue(is_password_usable(encoded))
self.assertTrue(check_password("lètmein", encoded))
Expand Down Expand Up @@ -278,16 +278,16 @@ def test_low_level_pbkdf2(self):
encoded = hasher.encode("lètmein", "seasalt2")
self.assertEqual(
encoded,
"pbkdf2_sha256$1000000$"
"seasalt2$egbhFghgsJVDo5Tpg/k9ZnfbySKQ1UQnBYXhR97a7sk=",
"pbkdf2_sha256$1200000$"
"seasalt2$hPlIUc6GqWsws6cZV1K8OuOARm1UrbZ3vLGFoHkH0ZI=",
)
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$1000000$seasalt2$3R9hvSAiAy5ARspAFy5GJ/2rjXo="
encoded, "pbkdf2_sha1$1200000$seasalt2$RGU4BAy93u+JDPtuMamdllndh+c="
)
self.assertTrue(hasher.verify("lètmein", encoded))

Expand Down

0 comments on commit 37373d9

Please sign in to comment.