Context Navigation

Ticket #26395: crypt_return_none.diff

File crypt_return_none.diff, 1.1 KB (added by L. Coues, 10 years ago)
patch

diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
index 7658379..57b8809 100644

                class CryptPasswordHasher(BasePasswordHasher):
         crypt = self._load_library()
         assert len(salt) == 2
         data = crypt.crypt(force_str(password), salt)
+        assert data != None
         # we don't need to store the salt, but Django used to do this
         return "%s$%s$%s" % (self.algorithm, '', data)

diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py
index a43c170..d5708b0 100644

                try:
 except ImportError:
     crypt = None
+# On some platform, crypt can be imported but crypt.crypt always return None
+if crypt and crypt.crypt("") == None:
+    crypt = None
 try:
     import bcrypt
 except ImportError:
-…
+               try:
 except ImportError:
     argon2 = None
 class PBKDF2SingleIterationHasher(PBKDF2PasswordHasher):
     iterations = 1