summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>2011-10-18 15:08:13 +0530
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>2011-10-18 15:08:13 +0530
commit2b4cf1d63fe2b59a55a4bc9859e544401ebef005 (patch)
treec784d8ca8779fe1dfaebadaca092216af5fe4cea
parent0ed8e2975329d777ba31fd0783543f3aaca7931b (diff)
[FIX] base_encrypt: unicode convert to utf-8
bzr revid: kjo@tinyerp.com-20111018093813-ghtt14ahp470hmd2
-rw-r--r--addons/base_crypt/crypt.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 5a55c02269d..c2fd0a25ef8 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -70,6 +70,8 @@ def gen_salt( length=8, symbols=ascii_letters + digits ):
import hashlib
def encrypt_md5( raw_pw, salt, magic=magic_md5 ):
+ raw_pw = raw_pw.encode('utf-8')
+ salt = salt.encode('utf-8')
hash = hashlib.md5()
hash.update( raw_pw + magic + salt )
st = hashlib.md5()