Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
4e042294
Commit
4e042294
authored
Aug 20, 2015
by
Matthew Hodgson
Browse files
IPR, feedback & acknowledgements
parent
b9ff140b
Changes
1
Hide whitespace changes
Inline
Side-by-side
docs/olm.rst
View file @
4e042294
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment