dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed an issue with latest CRYPT

Browse Source
This commit is contained in:
mdipierro
2012-07-18 12:34:26 -05:00
parent 1e657f0121
commit a1aebca4d3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-18 12:24:23) dev Version 2.00.0 (2012-07-18 12:34:21) dev
gluon/validators.py
+5 -2
View File
@@ -2570,8 +2570,11 @@ class LazyCrypt(object):
else: else:
salt = '' salt = ''
masterkey = key+salt masterkey = key+salt
h = simple_hash(self.password, masterkey, digest_alg) hashed = simple_hash(self.password, masterkey, digest_alg)
self.crypted = '%s$%s$%s' % (digest_alg, salt, h) if salt:
self.crypted = '%s$%s$%s' % (digest_alg, salt, hashed)
else:
self.crypted = hashed
return self.crypted return self.crypted
def __eq__(self, stored_password): def __eq__(self, stored_password):