Merge branch 'master' into develop

2019-03-01 19:15:05 +01:00 · 2019-03-01 19:15:05 +01:00 · a4b4ba3859
parent 89925bcd57 0beec878c6
commit a4b4ba3859
1 changed files with 3 additions and 3 deletions
--- a/process/epasswd.py
+++ b/process/epasswd.py
@ -70,9 +70,9 @@ class EPasswd:
        pw = self.get_passwd(id)
        if pw[0:4]=='$2a$' or pw[0:4]=='$2y$':
            try:
-                h1 = pw.encode('utf8')
-                h2 = passwd.encode('utf8')
-                return bcrypt.checkpw(h1, h2)
+                uhash = pw.encode('utf8')
+                upass = passwd.encode('utf8')
+                return bcrypt.checkpw(upass, uhash)
            except:
                return False
        return pw == passwd