Fix fallback to signing key for macaroon-secret-key

matrix-org · Jan 10, 2019 · 353f240 · 353f240
1 parent 67dbe4c
commit 353f240
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/synapse/config/key.py b/synapse/config/key.py
@@ -57,8 +57,8 @@ def read_config(self, 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)