diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-10-02 00:47:29 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-10-02 00:47:29 +0100 |
| commit | 63800ad8e61ebdfa756d8bde8466b70337b85d67 (patch) | |
| tree | 1d1b73a98608a685b7ad28c80daa4e6bb85699c8 /docs/megolm.rst | |
| parent | 6d80d934cd3727f2fec320e722124562ffb7dd21 (diff) | |
s/PCKS/PKCS/
Diffstat (limited to 'docs/megolm.rst')
| -rw-r--r-- | docs/megolm.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/megolm.rst b/docs/megolm.rst index 2ea0b94..1f04840 100644 --- a/docs/megolm.rst +++ b/docs/megolm.rst @@ -143,7 +143,7 @@ copy of the counter, ratchet, and public key. Message encryption ~~~~~~~~~~~~~~~~~~ -This version of Megolm uses AES-256_ in CBC_ mode with `PCKS#7`_ padding and +This version of Megolm uses AES-256_ in CBC_ mode with `PKCS#7`_ padding and HMAC-SHA-256_ (truncated to 64 bits). The 256 bit AES key, 256 bit HMAC key, and 128 bit AES IV are derived from the megolm ratchet :math:`R_i`: @@ -285,6 +285,6 @@ Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_. .. _`SHA-256`: https://tools.ietf.org/html/rfc6234 .. _`AES-256`: http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf .. _`CBC`: http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf -.. _`PCKS#7`: https://tools.ietf.org/html/rfc2315 +.. _`PKCS#7`: https://tools.ietf.org/html/rfc2315 .. _`Olm`: ./olm.html .. _`Protocol Buffers encoding`: https://developers.google.com/protocol-buffers/docs/encoding |