From fd28d13e19939c4d0bc29a8b9f6c122162058b84 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 22 Jun 2018 13:54:17 +0100
Subject: [PATCH] Server-enforced e2e for private rooms

---
 synapse/handlers/room.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8df8fcbba..a66433ad5 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -46,12 +46,14 @@ class RoomCreationHandler(BaseHandler):
             "history_visibility": "shared",
             "original_invitees_have_ops": False,
             "guest_can_join": True,
+            "encryption_alg": "m.megolm.v1.aes-sha2",
         },
         RoomCreationPreset.TRUSTED_PRIVATE_CHAT: {
             "join_rules": JoinRules.INVITE,
             "history_visibility": "shared",
             "original_invitees_have_ops": True,
             "guest_can_join": True,
+            "encryption_alg": "m.megolm.v1.aes-sha2",
         },
         RoomCreationPreset.PUBLIC_CHAT: {
             "join_rules": JoinRules.PUBLIC,
@@ -373,6 +375,15 @@ class RoomCreationHandler(BaseHandler):
                 content=content,
             )
 
+        if "encryption_alg" in config:
+            send(
+                etype="m.room.encryption",
+                state_key="",
+                content={
+                    'algorithm': config["encryption_alg"],
+                }
+            )
+
 
 class RoomContextHandler(BaseHandler):
     @defer.inlineCallbacks