From e30c2be062ab1a846e9d19ef2b575019f133fe4f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 15 Jan 2017 03:51:42 +0100 Subject: [PATCH] Improve encryption documentation --- docs/federation/encryption.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/federation/encryption.md b/docs/federation/encryption.md index 9d048a0..4bd0ae0 100644 --- a/docs/federation/encryption.md +++ b/docs/federation/encryption.md @@ -15,10 +15,10 @@ diaspora\* wraps the Salmon [Magic Envelope][magicsig] into a simple JSON struct } ~~~ -| Key | Description | -| -------------------------- |-------------------------------------------------------------------------------------------------------------- | -| `aes_key` | The [AES Key JSON](#aes-key-json-structure) encrypted with the recipients public key and then base64 encoded. | -| `encrypted_magic_envelope` | The [Magic Envelope][magicsig] encrypted with the `aes_key` and then base64 encoded. | +| Key | Description | +| -------------------------- |------------------------------------------------------------------------------------------------------------------------ | +| `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` using AES-256-CBC and then base64 encoded. | ### 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. | | `iv` | The base64 encoded AES iv. | +Both `key` and `id` have to be suitable for AES-256-CBC. + ## Additional information and specifications * [Magic Envelope][magicsig]