diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-14 20:36:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-14 20:36:19 +0000 |
| commit | b2a048962aa4d2921be2ceec3345cd32c8f853db (patch) | |
| tree | b48d3d6b0d8041bf27723b305f8ec10070fa0d93 /keystone | |
| parent | 9dd154393028297f8eda8b0ccd773993a492cfd2 (diff) | |
| parent | ed793ad5365e33e2fda54c3900c1ad9b2c93dc37 (diff) | |
Merge "make sure passwords work after migration" into redux
Diffstat (limited to 'keystone')
| -rw-r--r-- | keystone/common/utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/keystone/common/utils.py b/keystone/common/utils.py index 9c52b93f..b5269bed 100644 --- a/keystone/common/utils.py +++ b/keystone/common/utils.py @@ -143,7 +143,10 @@ class Ec2Signer(object): def hash_password(password): """Hash a password. Hard.""" - h = passlib.hash.sha512_crypt.encrypt(password.encode('utf-8'), + password_utf8 = password.encode('utf-8') + if passlib.hash.sha512_crypt.identify(password_utf8): + return password_utf8 + h = passlib.hash.sha512_crypt.encrypt(password_utf8, rounds=CONF.crypt_strength) return h |