Skip to content

Commit e8ce135

Browse files
committed
add clarification and examples
1 parent 5cc5908 commit e8ce135

File tree

1 file changed

+27
-2
lines changed

1 file changed

+27
-2
lines changed

proposals/1946-secure_server-side_storage.md

+27-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ clients will try to use the default key to decrypt secrets.
5757
Clients MUST ensure that the key is trusted before using it to encrypt secrets.
5858
One way to do that is to have the client that creates the key sign the key
5959
description (as signed JSON) using the user's master cross-signing key.
60-
Another way to do that is to prompt the user to enter the passphrase and ensure
61-
that the generated private key correponds to the public key.
60+
Another way to do that is to prompt the user to enter the passphrase used to
61+
generate the encryption key and ensure that the generated private key
62+
corresponds to the public key.
6263

6364
#### Secret storage
6465

@@ -79,6 +80,8 @@ Example:
7980

8081
Some secret is encrypted using keys with ID `key_id_1` and `key_id_2`:
8182

83+
`org.example.some.secret`:
84+
8285
```json
8386
{
8487
"encrypted": {
@@ -95,6 +98,28 @@ Some secret is encrypted using keys with ID `key_id_1` and `key_id_2`:
9598
}
9699
```
97100

101+
and the key descriptions for the keys would be:
102+
103+
`m.secret_storage.key.key_id_1`:
104+
105+
```json
106+
{
107+
"name": "Some key",
108+
"algorithm": "m.secret_storage.v1.curve25519-aes-sha2",
109+
// ... other properties according to algorithm
110+
}
111+
```
112+
113+
`m.secret_storage.key.key_id_2`:
114+
115+
```json
116+
{
117+
"name": "Some other key",
118+
"algorithm": "m.secret_storage.v1.curve25519-aes-sha2",
119+
// ... other properties according to algorithm
120+
}
121+
```
122+
98123
#### Encryption algorithms
99124

100125
##### `m.secret_storage.v1.curve25519-aes-sha2`

0 commit comments

Comments
 (0)