diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-03 15:44:50 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-03 15:44:50 +0000 |
| commit | f594c8a2c36785c3fee5b113c97143745d1b44be (patch) | |
| tree | c471022f8b1312f481c3f08bcd01a4a2edd374ac /synapse/handlers | |
| parent | Add some comments (diff) | |
| parent | Merge pull request #1192 from matrix-org/erikj/postgres_gist (diff) | |
| download | synapse-f594c8a2c36785c3fee5b113c97143745d1b44be.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/new_profile github/erikj/new_profile erikj/new_profile
Diffstat (limited to 'synapse/handlers')
| -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 3635521230..3851b35889 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -653,7 +653,7 @@ class AuthHandler(BaseHandler): Returns: Hashed password (str). """ - return bcrypt.hashpw(password + self.hs.config.password_pepper, + return bcrypt.hashpw(password.encode('utf8') + self.hs.config.password_pepper, bcrypt.gensalt(self.bcrypt_rounds)) def validate_hash(self, password, stored_hash): |