Merge pull request #53 from matrix-org/anoa/dinsic_release_1_18_x

Merge Synapse release v1.18.0 into 'dinsic'

1 files changed, 5 insertions, 0 deletions

diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 5ec4a77ccd..6a6d32c302 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -150,3 +150,8 @@ class EventContentFields(object):
     # Timestamp to delete the event after
     # cf https://github.com/matrix-org/matrix-doc/pull/2228
     SELF_DESTRUCT_AFTER = "org.matrix.self_destruct_after"
+
+
+class RoomEncryptionAlgorithms(object):
+    MEGOLM_V1_AES_SHA2 = "m.megolm.v1.aes-sha2"
+    DEFAULT = MEGOLM_V1_AES_SHA2