nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #50 from svbergerem/improve-encryption-docs

Browse source 
Improve encryption documentation
This commit is contained in:
Benjamin Neff 2017-01-15 04:05:41 +01:00 committed by GitHub
commit de0f625ac3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/federation/encryption.md
View file

@ -16,9 +16,9 @@ diaspora\* wraps the Salmon [Magic Envelope][magicsig] into a simple JSON struct
~~~ ~~~
| Key | Description | | Key | Description |
| -------------------------- |-------------------------------------------------------------------------------------------------------------- | | -------------------------- |------------------------------------------------------------------------------------------------------------------------ |
| `aes_key` | The [AES Key JSON](#aes-key-json-structure) encrypted with the recipients public key and then base64 encoded. | | `aes_key` | The [AES Key JSON](#aes-key-json-structure) encrypted with the recipients public key using RSA and then base64 encoded. |
| `encrypted_magic_envelope` | The [Magic Envelope][magicsig] encrypted with the `aes_key` and then base64 encoded. | | `encrypted_magic_envelope` | The [Magic Envelope][magicsig] encrypted with the `aes_key` using AES-256-CBC and then base64 encoded. |
### AES Key JSON structure ### AES Key JSON structure
@ -34,6 +34,8 @@ diaspora\* wraps the Salmon [Magic Envelope][magicsig] into a simple JSON struct
| `key` | The base64 encoded AES key. | | `key` | The base64 encoded AES key. |
| `iv` | The base64 encoded AES iv. | | `iv` | The base64 encoded AES iv. |
Both `key` and `id` have to be suitable for AES-256-CBC.
## Additional information and specifications ## Additional information and specifications
* [Magic Envelope][magicsig] * [Magic Envelope][magicsig]