Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-05 11:14:11 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

make definition of signatures fields more consistent

Browse source
This commit is contained in:
Hubert Chathi 2020-05-22 15:50:32 -04:00
parent e264124faa
commit 5b38c04e19
4 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/client-server/definitions/device_keys.yaml
View file

@ -47,16 +47,13 @@ properties:
"ed25519:JLAFKJWSCS": "lEuiRJBit0IG6nUf5pUzWTUEsRVVe/HJkoKuEww9ULI" "ed25519:JLAFKJWSCS": "lEuiRJBit0IG6nUf5pUzWTUEsRVVe/HJkoKuEww9ULI"
signatures: signatures:
type: object type: object
title: Signatures
description: |- description: |-
Signatures for the device key object. A map from user ID, to a map from Signatures for the device key object. A map from user ID, to a map from
``<algorithm>:<device_id>`` to the signature. ``<algorithm>:<device_id>`` to the signature.
The signature is calculated using the process described at `Signing The signature is calculated using the process described at `Signing
JSON`_. JSON`_.
additionalProperties:
type: object
additionalProperties:
type: string
example: example:
"@alice:example.com": "@alice:example.com":
"ed25519:JLAFKJWSCS": "dSO80A01XiigH3uBiDVx/EjzaoycHcjq9lfQX0uWsqxl2giMIiSPR8a4d291W1ihKJL/a+myXS367WT6NAIcBA" "ed25519:JLAFKJWSCS": "dSO80A01XiigH3uBiDVx/EjzaoycHcjq9lfQX0uWsqxl2giMIiSPR8a4d291W1ihKJL/a+myXS367WT6NAIcBA"

18
api/server-server/definitions/keys.yaml
View file

@ -75,18 +75,12 @@ properties:
required: ["expired_ts", "key"] required: ["expired_ts", "key"]
signatures: signatures:
type: object type: object
description: Digital signatures for this object signed using the ``verify_keys``. description: |-
additionalProperties: Digital signatures for this object signed using the ``verify_keys``.
type: object
title: Signed Server The signature is calculated using the process described at `Signing
example: { JSON`_.
"example.org": { title: Signatures
"ad25519:abc123": "VGhpcyBzaG91bGQgYWN0dWFsbHkgYmUgYSBzaWduYXR1cmU"
}
}
additionalProperties:
type: string
name: Encoded Signature Verification Key
valid_until_ts: valid_until_ts:
type: integer type: integer
format: int64 format: int64

12
api/server-server/third_party_invite.yaml
View file

@ -102,12 +102,12 @@ paths:
properties: properties:
signatures: signatures:
type: object type: object
description: The server signatures for this event. title: Signatures
additionalProperties: description: |-
type: object The server signatures for this event.
title: Server Signatures
additionalProperties: The signature is calculated using the process
type: string described at `Signing JSON`_.
example: { example: {
"magic.forest": { "magic.forest": {
"ed25519:3": "fQpGIW1Snz+pwLZu6sTy2aHy/DYWWTspTJRPyNp0PKkymfIsNffysMl6ObMMFdIJhk6g6pwlIqZ54rxo8SLmAg" "ed25519:3": "fQpGIW1Snz+pwLZu6sTy2aHy/DYWWTspTJRPyNp0PKkymfIsNffysMl6ObMMFdIJhk6g6pwlIqZ54rxo8SLmAg"

8
api/server-server/user_keys.yaml
View file

@ -88,10 +88,12 @@ paths:
description: The key, encoded using unpadded base64. description: The key, encoded using unpadded base64.
signatures: signatures:
type: object type: object
title: Signatures
description: |- description: |-
Signature for the device. Mapped from user ID to signature object. Signature of the key object.
additionalProperties:
type: string The signature is calculated using the process described at `Signing
JSON`_.
required: ['key', 'signatures'] required: ['key', 'signatures']
example: { example: {
"@alice:example.com": { "@alice:example.com": {