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

Apply suggestions from code review

Browse source 
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
This commit is contained in:
Hubert Chathi 2020-06-19 21:40:46 -04:00 committed by GitHub
parent efebba62de
commit 902444ceb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/client-server/cross_signing.yaml
View file

@ -52,16 +52,16 @@ paths:
- $ref: definitions/cross_signing_key.yaml - $ref: definitions/cross_signing_key.yaml
self_signing_key: self_signing_key:
description: |- description: |-
Optional. The user\'s self-signing key. Must be signed with Optional. The user\'s self-signing key. Must be signed by
the accompanied master, or by the user\'s most recently the accompanying master key, or by the user\'s most recently
uploaded master key if no master key is included in the uploaded master key if no master key is included in the
request. request.
allOf: allOf:
- $ref: definitions/cross_signing_key.yaml - $ref: definitions/cross_signing_key.yaml
user_signing_key: user_signing_key:
description: |- description: |-
Optional. The user\'s user-signing key. Must be signed with Optional. The user\'s user-signing key. Must be signed by
the accompanied master, or by the user\'s most recently the accompanying master key, or by the user\'s most recently
uploaded master key if no master key is included in the uploaded master key if no master key is included in the
request. request.
allOf: allOf:

14
specification/modules/end_to_end_encryption.rst
View file

@ -754,18 +754,18 @@ Cross-signing
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
Rather than requiring Alice to verify each of Bob's devices with each of her Rather than requiring Alice to verify each of Bob's devices with each of her
own devices and vice versa, the cross-signing feature allows users sign their own devices and vice versa, the cross-signing feature allows users to sign their
device keys such that Alice and Bob only need to verify once. With device keys such that Alice and Bob only need to verify once. With
cross-signing, each user has a set of cross-signing keys that are used to sign cross-signing, each user has a set of cross-signing keys that are used to sign
their own device keys and other users' keys, and can be used to trust device their own device keys and other users' keys, and can be used to trust device
keys that were not verified directly. keys that were not verified directly.
Each user has three ed25519 keys pairs for cross-signing: Each user has three ed25519 key pairs for cross-signing:
* a master key (MSK) that serves as the user's identity in cross-signing and signs * a master key (MSK) that serves as the user's identity in cross-signing and signs
their other cross-signing keys; their other cross-signing keys;
* a user-signing key (USK) -- only visible to the user that it belongs to -- * a user-signing key (USK) -- only visible to the user that it belongs to --
that signs other users' master keys, and that signs other users' master keys; and
* a self-signing key (SSK) that signs the user's own device keys. * a self-signing key (SSK) that signs the user's own device keys.
The master key may also be used to sign other items such as the backup key. The The master key may also be used to sign other items such as the backup key. The
@ -863,9 +863,11 @@ A user's master key could allow an attacker to impersonate that user to other
users, or other users to that user. Thus clients must ensure that the private users, or other users to that user. Thus clients must ensure that the private
part of the master key is treated securely. If clients do not have a secure part of the master key is treated securely. If clients do not have a secure
means of storing the master key (such as a secret storage system provided by means of storing the master key (such as a secret storage system provided by
the operating system), then clients must not store the private part. If a user the operating system), then clients must not store the private part.
changes their master key, clients of users that they communicate with must
notify their users about the change. If a user's client sees that any other user has changed their master key, that
client must notify the user about the change before allowing communication
between the users to continue.
A user's user-signing and self-signing keys are intended to be easily A user's user-signing and self-signing keys are intended to be easily
replaceable if they are compromised by re-issuing a new key signed by the replaceable if they are compromised by re-issuing a new key signed by the