Commit 1915a7e5 authored by Tim Graham's avatar Tim Graham
Browse files

Increased the default PBKDF2 iterations.

parent 97c3dfe1

django/contrib/auth/hashers.py

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher): 
    safely but you must rename the algorithm if you change SHA256.

    """

    algorithm = "pbkdf2_sha256"

    iterations = 30000

    iterations = 36000

    digest = hashlib.sha256



    def encode(self, password, salt, iterations=None):

docs/releases/1.11.txt

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ Minor features 
:mod:`django.contrib.auth`

~~~~~~~~~~~~~~~~~~~~~~~~~~



* ...

* The default iteration count for the PBKDF2 password hasher is increased by

  20%.



:mod:`django.contrib.contenttypes`

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

tests/auth_tests/test_hashers.py

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class TestUtilsHashPass(SimpleTestCase): 


    def test_pbkdf2(self):

        encoded = make_password('lètmein', 'seasalt', 'pbkdf2_sha256')

        self.assertEqual(encoded, 'pbkdf2_sha256$30000$seasalt$VrX+V8drCGo68wlvy6rfu8i1d1pfkdeXA4LJkRGJodY=')

        self.assertEqual(encoded, 'pbkdf2_sha256$36000$seasalt$mEUPPFJkT/xtwDU8rB7Q+puHRZnR07WRjerTkt/3HI0=')

        self.assertTrue(is_password_usable(encoded))

        self.assertTrue(check_password('lètmein', encoded))

        self.assertFalse(check_password('lètmeinz', encoded))
@@ -281,13 +281,13 @@ class TestUtilsHashPass(SimpleTestCase): 
    def test_low_level_pbkdf2(self):

        hasher = PBKDF2PasswordHasher()

        encoded = hasher.encode('lètmein', 'seasalt2')

        self.assertEqual(encoded, 'pbkdf2_sha256$30000$seasalt2$a75qzbogeVhNFeMqhdgyyoqGKpIzYUo651sq57RERew=')

        self.assertEqual(encoded, 'pbkdf2_sha256$36000$seasalt2$QkIBVCvGmTmyjPJ5yox2y/jQB8isvgUNK98FxOU1UYo=')

        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$30000$seasalt2$pMzU1zNPcydf6wjnJFbiVKwgULc=')

        self.assertEqual(encoded, 'pbkdf2_sha1$36000$seasalt2$GoU+9AubJ/xRkO0WD1Xf3WPxWfE=')

        self.assertTrue(hasher.verify('lètmein', encoded))



    @override_settings(