summary refs log tree commit diff
path: root/synapse/util/manhole.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-19 10:23:44 +0100
committerGitHub <noreply@github.com>2018-10-19 10:23:44 +0100
commit6a4d01ee94838b0f76c73311693be92394629306 (patch)
tree361050ae75d4c9d4d6bfce15f9bd4f3b6138788f /synapse/util/manhole.py
parentMerge pull request #4057 from matrix-org/rav/use_correct_python (diff)
parentchangelog (diff)
downloadsynapse-6a4d01ee94838b0f76c73311693be92394629306.tar.xz
Merge pull request #4060 from matrix-org/hawkowl/ssh-key-py3
Make manhole work on Python 3 again
Diffstat (limited to 'synapse/util/manhole.py')
-rw-r--r--synapse/util/manhole.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/manhole.py b/synapse/util/manhole.py
index 8d0f2a8918..cf43ab6a19 100644
--- a/synapse/util/manhole.py
+++ b/synapse/util/manhole.py
@@ -82,7 +82,7 @@ def manhole(username, password, globals):
     )
 
     factory = manhole_ssh.ConchFactory(portal.Portal(rlm, [checker]))
-    factory.publicKeys['ssh-rsa'] = Key.fromString(PUBLIC_KEY)
-    factory.privateKeys['ssh-rsa'] = Key.fromString(PRIVATE_KEY)
+    factory.publicKeys[b'ssh-rsa'] = Key.fromString(PUBLIC_KEY)
+    factory.privateKeys[b'ssh-rsa'] = Key.fromString(PRIVATE_KEY)
 
     return factory