diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-20 14:18:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-20 14:18:04 +0100 |
| commit | bc72d381b2d5322982204bb214453e2af56f70d5 (patch) | |
| tree | 4f6932f9a32e5e25b80e8202be75d04e50a9686e /synapse/handlers/auth.py | |
| parent | point to the CAPTCHA docs (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-bc72d381b2d5322982204bb214453e2af56f70d5.tar.xz | |
Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse 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 |