mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-08-05 07:27:52 +02:00
Compare commits
3 commits
1415b6b1ba
...
126c3f0a49
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
126c3f0a49 | ||
|
|
adde146d48 | ||
|
|
141cc8e11c |
|
|
@ -1624,7 +1624,7 @@ Otherwise, before inviting Bob to a room, Alice's client constructs and sends a
|
||||||
containing the sessions she is aware of in the room. Alice MUST include
|
containing the sessions she is aware of in the room. Alice MUST include
|
||||||
only [shareable encryption sessions](#shareable-encryption-sessions) in the
|
only [shareable encryption sessions](#shareable-encryption-sessions) in the
|
||||||
`room_keys` section of the structure; other sessions SHOULD be listed in the
|
`room_keys` section of the structure; other sessions SHOULD be listed in the
|
||||||
with `withheld` section.
|
`withheld` section.
|
||||||
|
|
||||||
3. The client serialises the `RoomKeyBundle` as JSON.
|
3. The client serialises the `RoomKeyBundle` as JSON.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,8 @@ properties:
|
||||||
example: "m.megolm.v1.aes-sha2"
|
example: "m.megolm.v1.aes-sha2"
|
||||||
room_id:
|
room_id:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-room-id
|
||||||
|
pattern: "^!"
|
||||||
description: |-
|
description: |-
|
||||||
The room where the session is used.
|
The room where the session is used.
|
||||||
example: "!Cuyf34gef24t:localhost"
|
example: "!Cuyf34gef24t:localhost"
|
||||||
|
|
@ -48,6 +50,7 @@ properties:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-unpadded-base64
|
||||||
description: |-
|
description: |-
|
||||||
A map from algorithm name (`ed25519`) to the Ed25519 signing key of
|
A map from algorithm name (`ed25519`) to the Ed25519 signing key of
|
||||||
the device which initiated the session originally, according to the
|
the device which initiated the session originally, according to the
|
||||||
|
|
@ -55,6 +58,7 @@ properties:
|
||||||
example: { "ed25519": "aj40p+aw64yPIdsxoog8jhPu9i7l7NcFRecuOQblE3Y" }
|
example: { "ed25519": "aj40p+aw64yPIdsxoog8jhPu9i7l7NcFRecuOQblE3Y" }
|
||||||
sender_key:
|
sender_key:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-unpadded-base64
|
||||||
description: |-
|
description: |-
|
||||||
Unpadded base64-encoded device Curve25519 key, of the device which
|
Unpadded base64-encoded device Curve25519 key, of the device which
|
||||||
initiated the session originally, according to the creator of this
|
initiated the session originally, according to the creator of this
|
||||||
|
|
@ -67,9 +71,10 @@ properties:
|
||||||
example: "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ"
|
example: "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ"
|
||||||
session_key:
|
session_key:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-unpadded-base64
|
||||||
description: |-
|
description: |-
|
||||||
Unpadded base64-encoded session key in [session-export
|
Unpadded base64-encoded session key in [session-export
|
||||||
format](https://gitlab.matrix.org/matrix-org/olm/blob/master/docs/megolm.md#session-export-format).
|
format](/olm-megolm/megolm/#session-export-format).
|
||||||
example: "AgAAAADxKHa9uFxcXzwYoNueL5Xqi69IkD4sni8Llf..."
|
example: "AgAAAADxKHa9uFxcXzwYoNueL5Xqi69IkD4sni8Llf..."
|
||||||
required:
|
required:
|
||||||
- algorithm
|
- algorithm
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,8 @@ properties:
|
||||||
The encryption algorithm for the key that this event is about.
|
The encryption algorithm for the key that this event is about.
|
||||||
room_id:
|
room_id:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-room-id
|
||||||
|
pattern: "^!"
|
||||||
description: |-
|
description: |-
|
||||||
Required if `code` is not `m.no_olm`. The room for the key that
|
Required if `code` is not `m.no_olm`. The room for the key that
|
||||||
this event is about.
|
this event is about.
|
||||||
|
|
@ -17,6 +19,7 @@ properties:
|
||||||
that this event is about.
|
that this event is about.
|
||||||
sender_key:
|
sender_key:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-unpadded-base64
|
||||||
description: |-
|
description: |-
|
||||||
The unpadded base64-encoded device curve25519 key of the event\'s
|
The unpadded base64-encoded device curve25519 key of the event\'s
|
||||||
sender.
|
sender.
|
||||||
|
|
@ -28,6 +31,7 @@ properties:
|
||||||
- m.unauthorised
|
- m.unauthorised
|
||||||
- m.unavailable
|
- m.unavailable
|
||||||
- m.no_olm
|
- m.no_olm
|
||||||
|
- m.history_not_shared
|
||||||
description: |-
|
description: |-
|
||||||
A machine-readable code for why the key was not sent. Codes beginning
|
A machine-readable code for why the key was not sent. Codes beginning
|
||||||
with `m.` are reserved for codes defined in the Matrix
|
with `m.` are reserved for codes defined in the Matrix
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ description: |-
|
||||||
This event type is used to indicate that the sender is not sharing room keys
|
This event type is used to indicate that the sender is not sharing room keys
|
||||||
with the recipient. It is sent as a to-device event.
|
with the recipient. It is sent as a to-device event.
|
||||||
|
|
||||||
Possible values for `code` include:
|
The following values for `code` are defined:
|
||||||
|
|
||||||
* `m.blacklisted`: the user/device was blacklisted.
|
* `m.blacklisted`: the user/device was blacklisted.
|
||||||
* `m.unverified`: the user/device was not verified, and the sender is only
|
* `m.unverified`: the user/device was not verified, and the sender is only
|
||||||
|
|
@ -19,6 +19,13 @@ description: |-
|
||||||
* `m.unavailable`: sent in reply to a key request if the device that the
|
* `m.unavailable`: sent in reply to a key request if the device that the
|
||||||
key is requested from does not have the requested key.
|
key is requested from does not have the requested key.
|
||||||
* `m.no_olm`: an olm session could not be established.
|
* `m.no_olm`: an olm session could not be established.
|
||||||
|
* **[Added in `v1.19`]** `m.history_not_shared`: when used as part of a
|
||||||
|
[`RoomKeyBundle` structure](/client-server-api/#definition-roomkeybundle),
|
||||||
|
indicates to the recipient of the bundle that the corresponding room key
|
||||||
|
was not marked as
|
||||||
|
[shareable](/client-server-api/#shareable-encryption-sessions) by the
|
||||||
|
sender. Clients SHOULD NOT use this `code` in a `m.room_key.withheld`
|
||||||
|
event.
|
||||||
|
|
||||||
In most cases, this event refers to a specific room key. The one exception to
|
In most cases, this event refers to a specific room key. The one exception to
|
||||||
this is when the sender is unable to establish an olm session with the
|
this is when the sender is unable to establish an olm session with the
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@ properties:
|
||||||
properties:
|
properties:
|
||||||
room_id:
|
room_id:
|
||||||
type: string
|
type: string
|
||||||
|
format: mx-room-id
|
||||||
|
pattern: "^!"
|
||||||
description: The room to which the keys in the key bundle relate.
|
description: The room to which the keys in the key bundle relate.
|
||||||
file:
|
file:
|
||||||
description: |-
|
description: |-
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue