Skip to content

Commit

Permalink
Specify the order in which one-time keys are returned (MSC4225)
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Balaam <[email protected]>
  • Loading branch information
andybalaam committed Dec 9, 2024
1 parent 075a98d commit 5ca819b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/2029.clarification
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Specify order of one-time keys, as per [MSC4225](https://github.com/matrix-org/matrix-spec-proposals/pull/4225).
7 changes: 7 additions & 0 deletions data/api/client-server/keys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,13 @@ paths:
See the [key algorithms](/client-server-api/#key-algorithms) section for information
on the Key Object format.
Keys should be returned in the order that they were
uploaded via
[/keys/upload](/client-server-api/#post_matrixclientv3keysupload).
All keys uploaded in a given call to `/keys/upload` are
considered equivalent in this regard; no ordering is
specified within them.
If necessary, the claimed key might be a fallback key. Fallback
keys are re-used by the server until replaced by the device.
patternProperties:
Expand Down
7 changes: 7 additions & 0 deletions data/api/server-server/user_keys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ paths:
See the [Client-Server Key Algorithms](/client-server-api/#key-algorithms) section for more information on
the Key Object format.
Keys should be returned in the order that they were
uploaded via
[/keys/upload](/client-server-api/#post_matrixclientv3keysupload).
All keys uploaded in a given call to `/keys/upload` are
considered equivalent in this regard; no ordering is
specified within them.
# User
patternProperties:
"^@":
Expand Down

0 comments on commit 5ca819b

Please sign in to comment.