Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-07-31 18:17:48 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

replace "Olm message" where not referring to the Olm message format (#2383)

Browse source 
* replace "Olm message" where not referring to the Olm message format

* add newsfragment
This commit is contained in:
gewitternacht 2026-06-01 14:40:39 +02:00 committed by GitHub
parent ce47b27acf
commit f65501882d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/2383.clarification Normal file
View file

@ -0,0 +1 @@
Replace "Olm message" with "event encrypted using Olm" where not referring to the Olm message format.

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

@ -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 to the claimed `sender`. This requires a signed "device keys" structure
for that Curve25519 key, which can be obtained in one of two ways: 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. in the decrypted content.
2. The keys are returned via a [`/keys/query`](#post_matrixclientv3keysquery) 2. The keys are returned via a [`/keys/query`](#post_matrixclientv3keysquery)
request. Note that both the Curve25519 key **and** the Ed25519 key in request. Note that both the Curve25519 key **and** the Ed25519 key in

2
data/api/client-server/definitions/olm_payload.yaml
View file

@ -16,7 +16,7 @@
type: object type: object
title: OlmPayload title: OlmPayload
description: |- description: |-
The plaintext payload of Olm message events. The plaintext payload of an event encrypted using Olm.
properties: properties:
type: type:
type: string type: string