aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2015-08-20 22:59:52 +0200
committerMatthew Hodgson <matthew@matrix.org>2015-08-20 22:59:52 +0200
commit4e042294e47319b00a1333beee671a36095aa0bb (patch)
tree3abb35434e14b6d12c61d4e7a383b67bce03144c /docs
parentb9ff140b175993b6bfde6a36b3a37dbdf92cf79a (diff)
IPR, feedback & acknowledgements
Diffstat (limited to 'docs')
-rw-r--r--docs/olm.rst17
1 files changed, 17 insertions, 0 deletions
diff --git a/docs/olm.rst b/docs/olm.rst
index 7933d36..b175355 100644
--- a/docs/olm.rst
+++ b/docs/olm.rst
@@ -260,6 +260,23 @@ MAC is appended to the message.
&= HKDF\left(M_{i,j},\,\text{"OLM\_KEYS"}\right) \\
\end{align}
+IPR
+---
+
+The Olm specification (this document) is hereby placed in the public domain.
+
+Feedback
+--------
+
+Can be sent to mark at matrix.org.
+
+Acknowledgements
+----------------
+
+The ratchet that Olm implements was designed by Trevor Perrin and Moxie
+Marlinspike - details at https://github.com/trevp/axolotl/wiki. Olm is an
+entirely a new implementation written by the Matrix.org team.
+
.. _`Curve25519`: http://cr.yp.to/ecdh.html
.. _`Triple Diffie-Hellman`: https://whispersystems.org/blog/simplifying-otr-deniability/
.. _`HKDF-SHA-256`: https://tools.ietf.org/html/rfc5869