diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-28 15:42:25 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-28 15:42:25 +0100 |
| commit | b143641b2060ec031a8a11959a669345cd16c394 (patch) | |
| tree | 842687eeead33ab1a11b429864bcac8ce7029c61 /synapse/handlers/register.py | |
| parent | Merge branch 'release-v0.10.0' into develop (diff) | |
| parent | Remove unused import (diff) | |
| download | synapse-b143641b2060ec031a8a11959a669345cd16c394.tar.xz | |
Merge pull request #258 from matrix-org/slowtestsmakemesad
Swap out bcrypt for md5 in tests
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 56d125f753..ef4081e3fe 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -25,7 +25,6 @@ import synapse.util.stringutils as stringutils from synapse.util.async import run_on_reactor from synapse.http.client import CaptchaServerHttpClient -import bcrypt import logging import urllib @@ -82,7 +81,7 @@ class RegistrationHandler(BaseHandler): yield run_on_reactor() password_hash = None if password: - password_hash = bcrypt.hashpw(password, bcrypt.gensalt()) + password_hash = self.auth_handler().hash(password) if localpart: yield self.check_username(localpart) |