Commit 593c9eb6 authored by Tim Graham's avatar Tim Graham
Browse files

Increased the default PBKDF2 iterations for the 1.10 release cycle.

parent 54848a96

django/contrib/auth/hashers.py

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

    """

    algorithm = "pbkdf2_sha256"

    iterations = 24000

    iterations = 30000

    digest = hashlib.sha256



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

docs/releases/1.10.txt

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ Minor features 
:mod:`django.contrib.auth`

^^^^^^^^^^^^^^^^^^^^^^^^^^



* ...

* The default iteration count for the PBKDF2 password hasher has been increased

  by 25%. This backwards compatible change will not affect users who have

  subclassed ``django.contrib.auth.hashers.PBKDF2PasswordHasher`` to change the

  default value.



:mod:`django.contrib.contenttypes`

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/auth_tests/test_hashers.py

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ class TestUtilsHashPass(SimpleTestCase): 
    def test_pbkdf2(self):

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

        self.assertEqual(encoded,

            'pbkdf2_sha256$24000$seasalt$V9DfCAVoweeLwxC/L2mb+7swhzF0XYdyQMqmusZqiTc=')

            'pbkdf2_sha256$30000$seasalt$VrX+V8drCGo68wlvy6rfu8i1d1pfkdeXA4LJkRGJodY=')

        self.assertTrue(is_password_usable(encoded))

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

        self.assertFalse(check_password('lètmeinz', encoded))
@@ -244,14 +244,14 @@ class TestUtilsHashPass(SimpleTestCase): 
        hasher = PBKDF2PasswordHasher()

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

        self.assertEqual(encoded,

            'pbkdf2_sha256$24000$seasalt2$TUDkfilKHVC7BkaKSZgIKhm0aTtXlmcw/5C1FeS/DPk=')

            'pbkdf2_sha256$30000$seasalt2$a75qzbogeVhNFeMqhdgyyoqGKpIzYUo651sq57RERew=')

        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$24000$seasalt2$L37ETdd9trqrsJDwapU3P+2Edhg=')

            'pbkdf2_sha1$30000$seasalt2$pMzU1zNPcydf6wjnJFbiVKwgULc=')

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



    def test_upgrade(self):