wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2372 from matrix-org/jryans/clarify-cross-signing-examples

Browse source 
Clarify cross-signing examples
This commit is contained in:
Hubert Chathi 2019-12-02 16:30:01 -05:00 • committed by GitHub
commit 75a6a28c6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
proposals/1756-cross-signing.md
View file

@ -216,12 +216,12 @@ response:
} }
``` ```
Similarly, the federation endpoints `GET /user/keys/query` and `POST Similarly, the federation endpoints `POST /user/keys/query` and `POST
/user/devices/{userId}` will include the master and self-signing keys. (It /user/devices/{userId}` will include the master and self-signing keys. (It
will not include the user-signing key because it is not intended to be visible will not include the user-signing key because it is not intended to be visible
to other users.) to other users.)
`POST /keys/query` `POST /user/keys/query`
``` json ``` json
{ {
@ -432,7 +432,8 @@ response:
} }
} }
}, },
"master_key": { "master_keys": {
"@alice:example.com": {
"user_id": "@alice:example.com", "user_id": "@alice:example.com",
"usage": ["master"], "usage": ["master"],
"keys": { "keys": {
@ -443,8 +444,10 @@ response:
"ed25519:HIJKLMN": "base64+signature+of+master+key" "ed25519:HIJKLMN": "base64+signature+of+master+key"
} }
} }
}
}, },
"self_signing_key": { "self_signing_keys": {
"@alice:example.com": {
"user_id": "@alice:example.com", "user_id": "@alice:example.com",
"usage": ["self_signing"], "usage": ["self_signing"],
"keys": { "keys": {
@ -456,6 +459,7 @@ response:
} }
} }
} }
}
} }
``` ```