From fe3f43a905cff0406650002540a26874bf985dd6 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Fri, 31 Oct 2025 14:52:15 +0100 Subject: [PATCH] Point Olm and Megolm links at the new internal specification (#2242) Relates to: #1543 Signed-off-by: Johannes Marbach --- changelogs/internal/newsfragments/2242.clarification | 1 + .../client-server-api/modules/end_to_end_encryption.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 changelogs/internal/newsfragments/2242.clarification diff --git a/changelogs/internal/newsfragments/2242.clarification b/changelogs/internal/newsfragments/2242.clarification new file mode 100644 index 00000000..68758818 --- /dev/null +++ b/changelogs/internal/newsfragments/2242.clarification @@ -0,0 +1 @@ +Inline Olm & Megolm specifications. diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md index 3154f384..a6711126 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -1457,8 +1457,8 @@ readers without adding any useful extra information. ##### `m.olm.v1.curve25519-aes-sha2` The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the -Olm ratchet, as defined by the [Olm -specification](http://matrix.org/docs/spec/olm.html). This uses: +Olm ratchet, as defined by the [Olm specification](/olm-megolm/olm). +This uses: - Curve25519 for the initial key agreement. - 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" %}} The name `m.megolm.v1.aes-sha2` corresponds to version 1 of the Megolm -ratchet, as defined by the [Megolm -specification](http://matrix.org/docs/spec/megolm.html). This uses: +ratchet, as defined by the [Megolm specification](/olm-megolm/megolm). +This uses: - HMAC-SHA-256 for the hash ratchet. - HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated HMAC-SHA-256