diff options
| author | Olivier Dony <odo@openerp.com> | 2015-07-29 13:54:37 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-07-29 13:54:41 +0200 |
| commit | cc5860fbcf86568f2ca7404cf8c47e41357c0f3d (patch) | |
| tree | fdd6549d360cf1bafb76faced463772fe2e184d8 /addons/auth_crypt | |
| parent | 5c7190c93fca33cf421d1818e6d1c0597251cbc6 (diff) | |
| parent | b4de311b0c04d9ac4e576a7d72e47fe48ca5e405 (diff) | |
[MERGE] Forward port latest bugfixes from 7.0 up to b4de311
Diffstat (limited to 'addons/auth_crypt')
| -rw-r--r-- | addons/auth_crypt/auth_crypt.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py index a7e3a826223..3aac70c1a59 100644 --- a/addons/auth_crypt/auth_crypt.py +++ b/addons/auth_crypt/auth_crypt.py @@ -11,7 +11,7 @@ import hashlib import hmac import logging -from random import sample +import random from string import ascii_letters, digits import openerp @@ -22,12 +22,13 @@ _logger = logging.getLogger(__name__) magic_md5 = '$1$' magic_sha256 = '$5$' -openerp.addons.base.res.res_users.USER_PRIVATE_FIELDS.append('password_crypt') +from openerp.addons.base.res import res_users +res_users.USER_PRIVATE_FIELDS.append('password_crypt') def gen_salt(length=8, symbols=None): if symbols is None: symbols = ascii_letters + digits - return ''.join(sample(symbols, length)) + return ''.join(random.SystemRandom().sample(symbols, length)) def md5crypt( raw_pw, salt, magic=magic_md5 ): """ md5crypt FreeBSD crypt(3) based on but different from md5 |