aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-18 14:40:10 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-18 14:40:10 +0100
commitc4ad39a3c427704492ffefc9a713c9634a55507b (patch)
treed85467e152929102fa1010b4b86f04d4671065e0 /docs
parentbe9d74063d5b05e7debe5ad832681c4807f38d24 (diff)
Linkify all of the HMAC and HKDF references
Diffstat (limited to 'docs')
-rw-r--r--docs/olm.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/olm.rst b/docs/olm.rst
index 1331a00..4a1d3c5 100644
--- a/docs/olm.rst
+++ b/docs/olm.rst
@@ -226,10 +226,10 @@ Olm Authenticated Encryption
Version 1
~~~~~~~~~
-Version 1 of Olm uses AES-256_ in CBC_ mode with `PCKS#7`_ padding for encryption
-and HMAC-SHA-256 for authentication. The 256 bit AES key, 256 bit HMAC key,
-and 128 bit AES IV are derived from the message key using HKDF-SHA-256 using
-the default salt and an info of ``"OLM_KEYS"``.
+Version 1 of Olm uses AES-256_ in CBC_ mode with `PCKS#7`_ padding for
+encryption and HMAC-SHA-256_ for authentication. The 256 bit AES key, 256 bit
+HMAC key, and 128 bit AES IV are derived from the message key using
+HKDF-SHA-256_ using the default salt and an info of ``"OLM_KEYS"``.
First the plain-text is encrypted to get the cipher-text, :math:`X_{i,j}`.
Then the entire message, both the headers and cipher-text, are HMAC'd and the