Compare commits

..

No commits in common. "3e6c1e35d9b72d5d8eca82ac15e009610e019580" and "c53c2d093a428ecb941fcac881a3900e621a2b21" have entirely different histories.

View file

@ -1742,11 +1742,11 @@ The content of an event encrypted using Olm has the following format:
Note that when the event is received from the server, it will have a `type`
(with a value of `m.room.encrypted`) and `sender` property alongside the
`content` property. In `content`, `ciphertext` is a mapping from a device
Curve25519 key to an object with a `type` and a `body`. Here, `body` is a
Base64-encoded [Olm message](/olm-megolm/olm/#the-olm-message-format), and
`type` is an integer indicating the type of the message:
0 for the initial [pre-key messages](/olm-megolm/olm/#pre-key-messages),
1 for [normal messages](/olm-megolm/olm/#normal-messages).
Curve25519 key to an object with a `type` and a `body`. Here, `type` is an
integer indicating the type of the message body:
0 for the initial [pre-key message](/olm-megolm/olm/#pre-key-messages),
1 for [normal messages](/olm-megolm/olm/#normal-messages);
`body` is a Base64-encoded [Olm message body](/olm-megolm/olm/#the-olm-message-format).
Olm sessions will generate messages with a type of 0 until they receive
a message. Once a session has decrypted a message it will produce
@ -1912,7 +1912,7 @@ The content of an event encrypted using Megolm has the following format:
Note that when the event is received from the server, it will have additional
properties alongside the `content` property, including a `type` (with a value
of `m.room.encrypted`) and a `sender` property. In `content`, `ciphertext`
is a Base64-encoded [Megolm message](/olm-megolm/megolm/#message-format),
is a Base64-encoded [Megolm message body](/olm-megolm/megolm/#message-format),
whose plaintext body is of the form:
```json