Merge pull request #1711 from matrix-org/matthew/utf8-password-change

fix ability to change password to a non-ascii one
2016-12-20 00:02:13 +00:00 · 2016-12-20 00:02:13 +00:00 · 09f15918be
parent da2c8f3c94 f2a5aebf98
commit 09f15918be
1 changed files with 2 additions and 2 deletions
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@ -656,8 +656,8 @@ class AuthHandler(BaseHandler):
            Whether self.hash(password) == stored_hash (bool).
        """
        if stored_hash:
-            return bcrypt.hashpw(password + self.hs.config.password_pepper,
-                                 stored_hash.encode('utf-8')) == stored_hash
+            return bcrypt.hashpw(password.encode('utf8') + self.hs.config.password_pepper,
+                                 stored_hash.encode('utf8')) == stored_hash
        else:
            return False