From efebba62dedb266c578b5b642c817e139d31feb2 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 15 Jun 2020 18:38:47 -0400 Subject: [PATCH] result may also include signatures --- api/client-server/keys.yaml | 4 +++- api/server-server/user_keys.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/client-server/keys.yaml b/api/client-server/keys.yaml index 7b5e9875..77434ea3 100644 --- a/api/client-server/keys.yaml +++ b/api/client-server/keys.yaml @@ -240,7 +240,9 @@ paths: Information on the master cross-signing keys of the queried users. A map from user ID, to master key information. For each key, the information returned will be the same as uploaded via - ``/keys/device_signing/upload``. + ``/keys/device_signing/upload``, along with the signatures + uploaded via ``/keys/signatures/upload`` that the requesting user + is allowed to see. additionalProperties: allOf: - $ref: definitions/cross_signing_key.yaml diff --git a/api/server-server/user_keys.yaml b/api/server-server/user_keys.yaml index ae8ccd7e..c7cf6b76 100644 --- a/api/server-server/user_keys.yaml +++ b/api/server-server/user_keys.yaml @@ -184,7 +184,9 @@ paths: Information on the master cross-signing keys of the queried users. A map from user ID, to master key information. For each key, the information returned will be the same as uploaded via - ``/keys/device_signing/upload``. + ``/keys/device_signing/upload``, along with the signatures + uploaded via ``/keys/signatures/upload`` that the user is + allowed to see. additionalProperties: allOf: - $ref: ../client-server/definitions/cross_signing_key.yaml