Skip to content

Commit

Permalink
Differentiate the names of both SessionData formats
Browse files Browse the repository at this point in the history
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
  • Loading branch information
zecakeh committed Jun 20, 2024
1 parent 8db8f44 commit 262e127
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions content/client-server-api/modules/end_to_end_encryption.md
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ the following format:
The `session_data` field in the backups is constructed as follows:

1. Encode the session key to be backed up as a JSON object using the
`SessionData` format defined below.
`BackedUpSessionData` format defined below.

2. Generate an ephemeral curve25519 key, and perform an ECDH with the
ephemeral key and the backup's public key to generate a shared
Expand Down Expand Up @@ -1427,7 +1427,7 @@ user-supplied passphrase, and is created as follows:

###### Key export format

The exported sessions are formatted as a JSON array of `SessionData`
The exported sessions are formatted as a JSON array of `ExportedSessionData`
objects described as follows:

{{% definition path="api/client-server/definitions/megolm_export_session_data" %}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


type: object
title: SessionData
title: BackedUpSessionData
description: |-
The format of a backed-up session key, prior to encryption, when using the
`m.megolm_backup.v1.curve25519-aes-sha2` algorithm.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
allOf:
- $ref: key_backup_session_data.yaml
- type: object
title: ExportedSessionData
description: |-
The format used to encode a Megolm session key for export.
Expand Down

0 comments on commit 262e127

Please sign in to comment.