summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-04-30 17:54:01 +0100
committerMark Haines <mjark@negativecurvature.net>2015-04-30 17:54:01 +0100
commit62cebee8ee320f530f8aa9cd72419a4cca2f94ea (patch)
tree14ffc828748c2802d72a4826c97586a237abb8e7 /synapse
parentUpdate metrics.py (diff)
downloadsynapse-62cebee8ee320f530f8aa9cd72419a4cca2f94ea.tar.xz
Update key.py
Diffstat (limited to '')
-rw-r--r--synapse/config/key.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py
index 27e0d2906e..0494c0cb77 100644
--- a/synapse/config/key.py
+++ b/synapse/config/key.py
@@ -120,9 +120,10 @@ class KeyConfig(Config):
             signing_keys = self.read_file(signing_key_path, "signing_key")
             if len(signing_keys.split("\n")[0].split()) == 1:
                 # handle keys in the old format.
+                key_id = "a_" + random_string(4)
                 key = syutil.crypto.signing_key.decode_signing_key_base64(
                     syutil.crypto.signing_key.NACL_ED25519,
-                    "auto",
+                    key_id,
                     signing_keys.split("\n")[0]
                 )
                 with open(signing_key_path, "w") as signing_key_file: