diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-11 02:22:48 +1100 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-11 02:22:48 +1100 |
| commit | 522dada206601e8884ecc09d0cfbd2294089deeb (patch) | |
| tree | 655bda603502caa8de2a0cb858557dac7d5240e8 /synapse/config | |
| parent | Merge pull request #4342 from aaronraimist/new-virtualenv (diff) | |
| parent | Merge Synapse v0.34.1.1 (diff) | |
| download | synapse-522dada206601e8884ecc09d0cfbd2294089deeb.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/key.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 53f48fe2dd..3b11f0cfa9 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -57,8 +57,8 @@ class KeyConfig(Config): # Unfortunately, there are people out there that don't have this # set. Lets just be "nice" and derive one from their secret key. logger.warn("Config is missing missing macaroon_secret_key") - seed = self.signing_key[0].seed - self.macaroon_secret_key = hashlib.sha256(seed) + seed = bytes(self.signing_key[0]) + self.macaroon_secret_key = hashlib.sha256(seed).digest() self.expire_access_token = config.get("expire_access_token", False) |