Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

utils.gen.saltHash: encode string before hashing it.

This commit is contained in:
Valentin Lorentz 2012-08-04 17:12:23 +02:00
parent ab978a8c31
commit d3d93da602
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/gen.py
View File

@ -148,7 +148,7 @@ def saltHash(password, salt=None, hash='sha'):
hasher = crypt.sha
elif hash == 'md5':
hasher = crypt.md5
return '|'.join([salt, hasher(salt + password).hexdigest()])
return '|'.join([salt, hasher((salt + password).encode('utf8')).hexdigest()])
def safeEval(s, namespace={'True': True, 'False': False, 'None': None}):
"""Evaluates s, safely. Useful for turning strings into tuples/lists/etc.