summaryrefslogtreecommitdiff
path: root/pages/features/cryptography
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-06-17 14:22:16 -0700
committerelijah <elijah@riseup.net>2015-06-17 14:22:16 -0700
commit53676ba36a7aba2ff8df1d0a38322dd15cf54031 (patch)
tree7bc0df14f49715b38b42587802c68a921bf6b983 /pages/features/cryptography
parent262ad4ad6002cdb9b2fb99e390d4249f6f6f00ba (diff)
added email page
Diffstat (limited to 'pages/features/cryptography')
-rw-r--r--pages/features/cryptography/en.text4
1 files changed, 3 insertions, 1 deletions
diff --git a/pages/features/cryptography/en.text b/pages/features/cryptography/en.text
index 5c077c6..30b22b4 100644
--- a/pages/features/cryptography/en.text
+++ b/pages/features/cryptography/en.text
@@ -66,10 +66,12 @@ p((. The block-encrypted local SQLite database uses @AES-256-CBC@ using the firs
p((. Per-document encryption of documents stored remotely uses symmetric encryption with AES-256-CTR or XSalsa20 cipher using 256 bit keys. The library pycryptopp is used for this. The key and MAC used to encrypt each individual document are derived as follows:
-bc. storage_secret_a = first 256 bits of storage secret
+<pre style="margin-left: 2em">
+storage_secret_a = first 256 bits of storage secret
storage_secret_b = everything after first 256 bits of storage secret
document_key = hmac(document_id, storage_secret_b)
document_mac = hmac(document_id | document_revision | iv | ciphertext, hmac(document_id, storage_secret_a)
+</pre>
p((. Every document has its own key. The [@document_revision@] in the document MAC prevents a rollback to an old version of the document. HMAC uses SHA256.