Matthew Hodgson
a30c816cb6
typo
2016-09-17 15:44:55 +01:00
Mark Haines
71f23ffce1
Merge branch 'develop' into markjh/megolm
...
Conflicts:
lib/crypto/algorithms/megolm.js
2016-09-15 17:10:02 +01:00
Mark Haines
bde6a171f6
Add getKeysProved and getKeysClaimed methods to MatrixEvent.
...
These list the keys that sender of the event must have ownership
of and the keys of that the sender claims ownership of.
All olm and megolm messages prove ownership of a curve25519 key.
All new olm and megolm message will now claim ownership of a
ed25519 key.
This allows us to detect if an attacker claims ownership of a curve25519
key they don't own when advertising their device keys, because when we
receive an event from the original user it will have a different ed25519 key
to the attackers.
2016-09-15 16:26:43 +01:00
Mark Haines
6f9bb38232
Include our device key in megolm messages
2016-09-15 11:56:56 +01:00
Mark Haines
72a4b92022
Send a 'm.new_device' when we get a message for an unknown group session
...
This should reduce the risk of a device getting permenantly stuck unable
to receive encrypted group messages.
2016-09-14 19:16:24 +01:00
Mark Haines
0cc68bc125
Update the olm library version to 1.3.0
2016-09-14 14:24:21 +01:00
Richard van der Hoff
72b4f270ff
Show warnings on to-device decryption fail
...
If we can't decrypt a to-device message, show a warning about it, rather than
swallowing the error.
2016-09-09 12:37:02 +01:00
Richard van der Hoff
1da633e28a
Handle new device announcements
...
When we see a new device, download its keys, and then add it to the list of
things waiting for a keyshare.
2016-09-08 14:35:13 +01:00
Richard van der Hoff
cacafb461d
Share the current ratchet with new members
...
When a new member joins the room, we don't need to reset the megolm session;
instead we can just share the current state with the new user.
2016-09-08 14:20:54 +01:00
Richard van der Hoff
71c33420f6
Move crypto bits into a subdirectory
...
It was getting a bit sprawly; this should help keep things together.
2016-09-08 09:50:31 +01:00
