Use default values for encrypt_password and verify_password

This commit is contained in:
Matt Wright
2012-08-20 17:44:20 -04:00
parent 3a07970216
commit fa4668aa3f
5 changed files with 12 additions and 14 deletions
+8 -2
View File
@@ -85,12 +85,18 @@ def get_hmac(msg, salt=None, digestmod=None):
return base64.b64encode(hmac.new(salt, msg, digestmod).digest())
def verify_password(password, password_hash, salt=None, use_hmac=False):
def verify_password(password, password_hash, salt=None, use_hmac=None):
salt = salt or _security.password_salt
if use_hmac is None:
use_hmac = _security.password_hmac
hmac_value = get_hmac(password, salt) if use_hmac else password
return _pwd_context.verify(hmac_value, password_hash)
def encrypt_password(password, salt=None, use_hmac=False):
def encrypt_password(password, salt=None, use_hmac=None):
salt = salt or _security.password_salt
if use_hmac is None:
use_hmac = _security.password_hmac
hmac_value = get_hmac(password, salt) if use_hmac else password
return _pwd_context.encrypt(hmac_value)