summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-05-10 18:44:32 +0200
committerDavid Baker <dave@matrix.org>2016-05-10 18:44:32 +0200
commitf28643cea9ad41cd199b5b4a53e32a505dbfd961 (patch)
tree4e1ef545a5943a58ffd1dffc65d6d7920dd76d32
parentPass through get_events to pusher too (diff)
downloadsynapse-f28643cea9ad41cd199b5b4a53e32a505dbfd961.tar.xz
Uncommit accidentally commited edit to cipher list
Diffstat (limited to '')
-rw-r--r--synapse/crypto/context_factory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index 4fb32d2108..aad4752fe7 100644
--- a/synapse/crypto/context_factory.py
+++ b/synapse/crypto/context_factory.py
@@ -43,7 +43,7 @@ class ServerContextFactory(ssl.ContextFactory):
             context.use_privatekey(config.tls_private_key)
 
         context.load_tmp_dh(config.tls_dh_params_path)
-        context.set_cipher_list("!ADH:HIGH+kEDH:!AECDH:HIGH+kEECDH:HIGH")
+        context.set_cipher_list("!ADH:HIGH+kEDH:!AECDH:HIGH+kEECDH")
 
     def getContext(self):
         return self._context