summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
Diffstat (limited to 'keystone')
-rw-r--r--keystone/common/utils.py5
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