diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-20 14:13:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-20 14:13:54 +0100 |
| commit | 00c281f6a481671c8c37b17aa4ec7216bc551b27 (patch) | |
| tree | 95d3dceb57e2edf136192ad32f7a7ccadbdbbeb1 /synapse/handlers/auth.py | |
| parent | Update change log (diff) | |
| parent | Merge pull request #880 from matrix-org/markjh/registered_user (diff) | |
| download | synapse-00c281f6a481671c8c37b17aa4ec7216bc551b27.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 200793b5ed..b38f81e999 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -626,6 +626,6 @@ class AuthHandler(BaseHandler): Whether self.hash(password) == stored_hash (bool). """ if stored_hash: - return bcrypt.hashpw(password, stored_hash) == stored_hash + return bcrypt.hashpw(password, stored_hash.encode('utf-8')) == stored_hash else: return False |