From f65501882d689bcca924165e85951d26b7310ecc Mon Sep 17 00:00:00 2001 From: gewitternacht <60887951+gewitternacht@users.noreply.github.com> Date: Mon, 1 Jun 2026 14:40:39 +0200 Subject: [PATCH] replace "Olm message" where not referring to the Olm message format (#2383) * replace "Olm message" where not referring to the Olm message format * add newsfragment --- changelogs/client_server/newsfragments/2383.clarification | 1 + content/client-server-api/modules/end_to_end_encryption.md | 2 +- data/api/client-server/definitions/olm_payload.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelogs/client_server/newsfragments/2383.clarification diff --git a/changelogs/client_server/newsfragments/2383.clarification b/changelogs/client_server/newsfragments/2383.clarification new file mode 100644 index 00000000..a706825e --- /dev/null +++ b/changelogs/client_server/newsfragments/2383.clarification @@ -0,0 +1 @@ +Replace "Olm message" with "event encrypted using Olm" where not referring to the Olm message format. \ No newline at end of file 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 75acd93b..67313bbf 100644 --- a/content/client-server-api/modules/end_to_end_encryption.md +++ b/content/client-server-api/modules/end_to_end_encryption.md @@ -1698,7 +1698,7 @@ Curve25519 key used to establish the Olm session does indeed belong to the claimed `sender`. This requires a signed "device keys" structure for that Curve25519 key, which can be obtained in one of two ways: -1. An Olm message may be received with a `sender_device_keys` property +1. An event encrypted using Olm may be received with a `sender_device_keys` property in the decrypted content. 2. The keys are returned via a [`/keys/query`](#post_matrixclientv3keysquery) request. Note that both the Curve25519 key **and** the Ed25519 key in diff --git a/data/api/client-server/definitions/olm_payload.yaml b/data/api/client-server/definitions/olm_payload.yaml index fa3e7cc9..d322129e 100644 --- a/data/api/client-server/definitions/olm_payload.yaml +++ b/data/api/client-server/definitions/olm_payload.yaml @@ -16,7 +16,7 @@ type: object title: OlmPayload description: |- - The plaintext payload of Olm message events. + The plaintext payload of an event encrypted using Olm. properties: type: type: string