diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
| commit | f9834a3d1a25d0a715718a53e10752399985e3aa (patch) | |
| tree | 3d868eafb43d9646b15cd1aaee0f4093db802fd3 /synapse/handlers/auth.py | |
| parent | Merge branch 'erikj/ldap3_auth' (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-f9834a3d1a25d0a715718a53e10752399985e3aa.tar.xz | |
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4
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 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): |