Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crypto: Room key sharing #413

Merged
merged 46 commits into from
Nov 15, 2017
Merged

Crypto: Room key sharing #413

merged 46 commits into from
Nov 15, 2017

Conversation

manuroe
Copy link
Contributor

@manuroe manuroe commented Nov 15, 2017

No description provided.

manuroe and others added 30 commits October 27, 2017 09:31
Send m.room_key_request events when we fail to decrypt an event
Crypto: Process received room key requests
Crypto: Implement sharing of megolm keys
These terms were somewhat confusing (and, in the case of megolm, misleading),
so replace them with explicit senderCurve25519Key and claimedEd25519Key fields.

Port of matrix-org/matrix-js-sdk@5049919?diff=split#diff-8da4a0492c3c6427fae5b230c44456a0
when we receive a m.forwarded_room_key, add it to the crypto store, but
remember who forwarded it to us, so we can decide whether to trust them
separately.

Port of matrix-org/matrix-js-sdk@1f86dbd
…an event.

Retrying happens when we receive the key afterwards because of a late room key or because another user's device answers to our key share request.
In that case, as we are already in an asynchronously case, we do not need to come back to and block the main thread to decrypt the event as opposed to #205.
Crypto: Do not block the main thread when retrying the decryption of an event
(The issue was probably introduced by a bad merge conflict)
manuroe and others added 16 commits November 9, 2017 16:52
Add MXIncomingRoomKeyRequestManager to manage room key requests
…eviceListsChanges for other things than device lists handling
Else received sync data is sent to it before it is started.
MXCrypto: add a proper onSyncCompleted method to avoid to use handleD…
MXCrypto: add ignoreKeyRequest & ignoreAllPendingKeyRequestsFromUser …
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant