Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Point Olm and Megolm links at the new internal specification (#2242)
Some checks failed
Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled
Details
Spec / 🔎 Check Event schema examples (push) Has been cancelled
Details
Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled
Details
Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled
Details
Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled
Details
Spec / 📢 Run towncrier for changelog (push) Has been cancelled
Details
Spell Check / Spell Check with Typos (push) Has been cancelled
Details
Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled
Details
Spec / 📖 Build the spec (push) Has been cancelled
Details
Spec / 🔎 Validate generated HTML (push) Has been cancelled
Details
Spec / 📖 Build the historical backup spec (push) Has been cancelled
Details

Browse source 
Relates to: #1543
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
This commit is contained in:
Johannes Marbach 2025-10-31 14:52:15 +01:00 committed by GitHub
parent 4783619964
commit fe3f43a905
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/internal/newsfragments/2242.clarification Normal file
View file

@ -0,0 +1 @@
Inline Olm & Megolm specifications.

8
content/client-server-api/modules/end_to_end_encryption.md
View file

@ -1457,8 +1457,8 @@ readers without adding any useful extra information.
##### `m.olm.v1.curve25519-aes-sha2` ##### `m.olm.v1.curve25519-aes-sha2`
The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the
Olm ratchet, as defined by the [Olm Olm ratchet, as defined by the [Olm specification](/olm-megolm/olm).
specification](http://matrix.org/docs/spec/olm.html). This uses: This uses:
- Curve25519 for the initial key agreement. - Curve25519 for the initial key agreement.
- HKDF-SHA-256 for ratchet key derivation. - HKDF-SHA-256 for ratchet key derivation.
@ -1631,8 +1631,8 @@ This is due to a deprecation of the fields. See
{{% changed-in v="1.3" %}} {{% changed-in v="1.3" %}}
The name `m.megolm.v1.aes-sha2` corresponds to version 1 of the Megolm The name `m.megolm.v1.aes-sha2` corresponds to version 1 of the Megolm
ratchet, as defined by the [Megolm ratchet, as defined by the [Megolm specification](/olm-megolm/megolm).
specification](http://matrix.org/docs/spec/megolm.html). This uses: This uses:
- HMAC-SHA-256 for the hash ratchet. - HMAC-SHA-256 for the hash ratchet.
- HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated HMAC-SHA-256 - HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated HMAC-SHA-256