Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-02-01 20:13:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add note indicating similarity between key backup format and key exports

Browse source 
also copy description of forwarding_curve25519_key_chain from key exports, since
it's a better description
This commit is contained in:
Hubert Chathi 2020-03-20 16:49:53 -04:00
parent 41072fcaa9
commit e67ba0cd05
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
specification/modules/end_to_end_encryption.rst
View file

@ -861,12 +861,14 @@ The ``session_data`` field in the backups is constructed as follows:
algorithm string Required. The end-to-end message algorithm string Required. The end-to-end message
encryption algorithm that the key is encryption algorithm that the key is
for. Must be ``m.megolm.v1.aes-sha2``. for. Must be ``m.megolm.v1.aes-sha2``.
forwarding_curve25519_key_chain [string] Required. Chain of Curve25519 keys
through which this session was
forwarded, via
`m.forwarded_room_key`_ events.
sender_key string Required. Unpadded base64-encoded sender_key string Required. Unpadded base64-encoded
device curve25519 key. device curve25519 key.
sender_claimed_keys {string: Required. Object containing the sender_claimed_keys {string: Required. Object containing the
string} identity key for the sending device. string} identity key for the sending device.
forwarding_curve25519_key_chain [string] Required. Zero or more curve25519 keys
for devices who forwarded the session key.
session_key string Required. Unpadded base64-encoded session_key string Required. Unpadded base64-encoded
session key in `session-sharing format session key in `session-sharing format
<https://gitlab.matrix.org/matrix-org/olm/blob/master/docs/megolm.md#session-sharing-format>`_. <https://gitlab.matrix.org/matrix-org/olm/blob/master/docs/megolm.md#session-sharing-format>`_.
@ -961,6 +963,9 @@ described as follows:
session_key string Required. The key for the session. session_key string Required. The key for the session.
=============================== =========== ==================================== =============================== =========== ====================================
This is similar to the format before encryption used for the session keys in
`Server-side key backups`_ but adds the ``room_id`` and ``session_id`` fields.
Example: Example:
.. code:: json .. code:: json