mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-08-05 07:27:52 +02:00
Compare commits
No commits in common. "02ce04f083e75455845388d4fce6d50c3d26211c" and "cece4c28ecdc5d9f11c6b300d559fe71466d29a6" have entirely different histories.
02ce04f083
...
cece4c28ec
|
|
@ -1723,7 +1723,7 @@ Devices that support Olm must include "m.olm.v1.curve25519-aes-sha2" in
|
||||||
their list of supported messaging algorithms, must list a Curve25519
|
their list of supported messaging algorithms, must list a Curve25519
|
||||||
device key, and must publish Curve25519 one-time keys.
|
device key, and must publish Curve25519 one-time keys.
|
||||||
|
|
||||||
The content of an [`m.room.encrypted`](#mroomencrypted) event using Olm has the following format:
|
The content of an event encrypted using Olm has the following format:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
|
@ -1896,7 +1896,7 @@ This uses:
|
||||||
Devices that support Megolm must support Olm, and include
|
Devices that support Megolm must support Olm, and include
|
||||||
"m.megolm.v1.aes-sha2" in their list of supported messaging algorithms.
|
"m.megolm.v1.aes-sha2" in their list of supported messaging algorithms.
|
||||||
|
|
||||||
The content of an [`m.room.encrypted`](#mroomencrypted) event using Megolm has the following format:
|
The content of an event encrypted using Megolm has the following format:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ For example, a replacement for an encrypted event might look like this:
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
... and the plaintext body of the Megolm message might look like this:
|
... and, once decrypted, the event might look like this:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue