# Conflicts:
#	.gitignore
#	include/olm/olm.hh
#	javascript/README.md

Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

Split ratchet algorithm out to a separate section.

Also clean up some phrasing and correct a typo or two.

Fix jenkins.sh

Update comment on olm_account_one_time_keys

Document what it actually returns.

Remove the messsage index from olm_init_inbound_group_session

Add a olm_inbound_group_session_id method

Use the ed25519 public key as the group session id.

Some clients expect the session id to be globally unique,
so allowing the end devices to pick the session id will cause
problems.

Include the current ratchet index with the initial keys, this decreases
the risk that the client will supply the wrong index causing problems.

Sign the initial keys with the ratchet ed25519 key, this reduces the
risk of a client claiming a session that they didn't create.

Prepare changelog for v1.2.0

Sign megolm messages

Add ed25519 keys to the inbound and outbound sessions, and use them to sign and
verify megolm messages.

We just stuff the ed25519 public key in alongside the megolm session key (and
add a version byte), to save adding more boilerplate to the JS/python/etc
layers.

Remove redundant args from some js funcs, and fix a comment typo

Convert ed25519 pickling functions to C

Fix error handling for group sessions