diff options
| author | Kent Shikama <kent@kentshikama.com> | 2016-07-05 19:01:00 +0900 |
|---|---|---|
| committer | Kent Shikama <kent@kentshikama.com> | 2016-07-05 19:01:00 +0900 |
| commit | 1ee258430724618c7014bb176186c23b0b5b06f0 (patch) | |
| tree | 3dfb667c74d5cca2cb720111ca132830398f10a8 | |
| parent | Add comment to prompt changing of pepper (diff) | |
| download | synapse-1ee258430724618c7014bb176186c23b0b5b06f0.tar.xz | |
Fix pep8
| -rw-r--r-- | synapse/config/password.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/auth.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/password.py b/synapse/config/password.py index 7c5cb5f0e1..058a3a5346 100644 --- a/synapse/config/password.py +++ b/synapse/config/password.py @@ -34,4 +34,4 @@ class PasswordConfig(Config): # Change to a secret random string. # DO NOT CHANGE THIS AFTER INITIAL SETUP! #pepper: "HR32t0xZcQnzn3O0ZkEVuetdFvH1W6TeEPw6JjH0Cl+qflVOseGyFJlJR7ACLnywjN9" - """ \ No newline at end of file + """ diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index fd5fadf73d..be46681c64 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -750,7 +750,8 @@ class AuthHandler(BaseHandler): Returns: Hashed password (str). """ - return bcrypt.hashpw(password + self.hs.config.password_config.pepper, bcrypt.gensalt(self.bcrypt_rounds)) + return bcrypt.hashpw(password + self.hs.config.password_config.pepper, + bcrypt.gensalt(self.bcrypt_rounds)) def validate_hash(self, password, stored_hash): """Validates that self.hash(password) == stored_hash. |