diff --git a/pagure/lib/login.py b/pagure/lib/login.py index c38f32c..663ea4d 100644 --- a/pagure/lib/login.py +++ b/pagure/lib/login.py @@ -72,12 +72,6 @@ def generate_hashed_value(password): return '$2$' + bcrypt.hashpw(to_unicode(password), bcrypt.gensalt()) -def retrieve_hashed_value(password, hash_value): - """ Retrieve hash value to compare - """ - return bcrypt.hashpw(to_unicode(password), hash_value) - - def check_password(entered_password, user_password, seed=None): """ Version checking and returning the password """ @@ -89,7 +83,7 @@ def check_password(entered_password, user_password, seed=None): _, version, user_password = user_password.split('$', 2) if version == '2': - password = retrieve_hashed_value(entered_password, user_password) + password = bcrypt.hashpw(to_unicode(entered_password), user_password) elif version == '1': password = '%s%s' % (to_unicode(entered_password), seed) diff --git a/pagure/ui/login.py b/pagure/ui/login.py index ec54d5e..9b0f855 100644 --- a/pagure/ui/login.py +++ b/pagure/ui/login.py @@ -24,7 +24,7 @@ import pagure.lib.login import pagure.lib.model as model import pagure.lib.notify from pagure import APP, SESSION -from pagure.lib.login import generate_hashed_value, retrieve_hashed_value, get_password +from pagure.lib.login import generate_hashed_value, check_password # pylint: disable=E1101