summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-02 06:44:06 -0500
committerTim Graham <timograham@gmail.com>2016-01-02 06:54:13 -0500
commitf0ad641628a3ddc4e1c208e481b9cd0e9304dc3d (patch)
tree16ff15367a9ff91677359cad716205bdee60fade /django
parent0db6367fe2aa6ab3fd152eacf172d57db45c1ffb (diff)
Fixed #26016 -- Restored contrib.auth hashers compatibility with py-bcrypt.
Reverted "Explicitly passed rounds as rounds to bcrypt.gensalt()" This reverts commit 23529fb19594ffcc6ba6d716356b828157200288.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/auth/hashers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index 1a9ca4bd3e..74717c0c5c 100644
--- a/django/contrib/auth/hashers.py
+++ b/django/contrib/auth/hashers.py
@@ -286,7 +286,7 @@ class BCryptSHA256PasswordHasher(BasePasswordHasher):
def salt(self):
bcrypt = self._load_library()
- return bcrypt.gensalt(rounds=self.rounds)
+ return bcrypt.gensalt(self.rounds)
def encode(self, password, salt):
bcrypt = self._load_library()