Mark Haines
16b4865035
Merge pull request #241 from matrix-org/markjh/check_for_duplicate_message_ids
...
Check for duplicate message indexes for group messages
2016-10-21 09:55:38 +01:00
Mark Haines
20b310484b
Document the format of the keys
2016-10-21 09:54:57 +01:00
Mark Haines
8b856b9d15
Wrap the longer lines
2016-10-20 18:02:48 +01:00
Mark Haines
3f7df0d15c
Fiddle linebreaks
2016-10-20 17:59:15 +01:00
Mark Haines
e0917d3c47
Check for duplicate message indexes for group messages
2016-10-20 17:49:37 +01:00
Richard van der Hoff
b5c7c700d5
Check recipient and sender in Olm messages
...
Embed the sender, recipient, and recipient keys in the plaintext of Olm
messages, and check those fields on receipt.
Fixes https://github.com/vector-im/vector-web/issues/2483
2016-10-19 11:24:59 +01:00
Richard van der Hoff
832559926f
Fix the ed25519 key checking
...
Finish plumbing in the Ed25519 key checks. Make sure we store the claimed key
correctly in the megolm sessions, and keep them as a separate field in
MatrixEvent rather than stuffing them into _clearEvent
2016-09-20 20:42:08 +01:00
Richard van der Hoff
83bd420cd5
Return null from decryptEvent if session is unknown
...
This just makes the shape of the API a bit saner.
2016-09-20 20:39:40 +01:00
Richard van der Hoff
cd0b19f93f
Crypto: improve console logs
...
Attempt to make the console logs more helpful by reducing noise and adding
helpful debug info.
2016-09-18 21:55:38 +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
0d5d74674e
Remove spurious senderKey argument
2016-09-15 16:46:28 +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
38681202dc
Add olm version to client. Add semicolons.
2016-09-14 20:03:31 +01:00
Mark Haines
0d20a0acf0
Add a test to check that we have the right version of Olm
2016-09-14 19:59:32 +01:00
Mark Haines
9277a86403
Add the accidentally deleted sessionId documentation back
2016-09-14 19:35:31 +01:00
Mark Haines
5ec8688cf6
Semicolon
2016-09-14 19:26:44 +01:00
Mark Haines
6ae82a9cb4
Fix syntax error
2016-09-14 19:20:46 +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
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