From 6911171e83fbf322e42565f1f6a217ea24d73924 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 5 Feb 2020 22:29:56 +0100 Subject: [PATCH] Fix key export format example Signed-off-by: Nicolas Werner --- .../newsfragments/2430.clarification | 1 + .../modules/end_to_end_encryption.rst | 32 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 changelogs/client_server/newsfragments/2430.clarification diff --git a/changelogs/client_server/newsfragments/2430.clarification b/changelogs/client_server/newsfragments/2430.clarification new file mode 100644 index 00000000..56be0c1a --- /dev/null +++ b/changelogs/client_server/newsfragments/2430.clarification @@ -0,0 +1 @@ +Fix key export format example to match the specification. diff --git a/specification/modules/end_to_end_encryption.rst b/specification/modules/end_to_end_encryption.rst index 7758e2c1..af7b2c59 100644 --- a/specification/modules/end_to_end_encryption.rst +++ b/specification/modules/end_to_end_encryption.rst @@ -844,24 +844,22 @@ Example: .. code:: json - { - "sessions": [ - { - "algorithm": "m.megolm.v1.aes-sha2", - "forwarding_curve25519_key_chain": [ - "hPQNcabIABgGnx3/ACv/jmMmiQHoeFfuLB17tzWp6Hw" - ], - "room_id": "!Cuyf34gef24t:localhost", - "sender_key": "RF3s+E7RkTQTGF2d8Deol0FkQvgII2aJDf3/Jp5mxVU", - "sender_claimed_keys": { - "ed25519": "", - }, - "session_id": "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ", - "session_key": "AgAAAADxKHa9uFxcXzwYoNueL5Xqi69IkD4sni8Llf..." + [ + { + "algorithm": "m.megolm.v1.aes-sha2", + "forwarding_curve25519_key_chain": [ + "hPQNcabIABgGnx3/ACv/jmMmiQHoeFfuLB17tzWp6Hw" + ], + "room_id": "!Cuyf34gef24t:localhost", + "sender_key": "RF3s+E7RkTQTGF2d8Deol0FkQvgII2aJDf3/Jp5mxVU", + "sender_claimed_keys": { + "ed25519": "", }, - ... - ] - } + "session_id": "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ", + "session_key": "AgAAAADxKHa9uFxcXzwYoNueL5Xqi69IkD4sni8Llf..." + }, + ... + ] Messaging Algorithms --------------------