diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-01-10 12:31:25 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-01-10 12:42:56 +0000 |
| commit | 353f2407b76a2c8081d153b7c83d7b1bef9bb547 (patch) | |
| tree | b29da1233e611414855ac5780549e3b0d9b5655d | |
| parent | 0.33.2 changelog (diff) | |
| download | synapse-353f2407b76a2c8081d153b7c83d7b1bef9bb547.tar.xz | |
Fix fallback to signing key for macaroon-secret-key
| -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 279c47bb48..a7998c941d 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) |