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

Handle m.forwarded_room_key events #404

Merged
merged 4 commits into from
Nov 7, 2017

Conversation

manuroe
Copy link
Contributor

@manuroe manuroe commented Nov 7, 2017

When we get an m.forwarded_room_key, fish out the keys and add it to the OlmDevice for decrypting things, but remember who forwarded it to us, so we can decide whether to trust them separately.

Port of matrix-org/matrix-js-sdk#468

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
@manuroe manuroe merged commit 6249cbf into e2e_key_sharing Nov 7, 2017
@manuroe manuroe deleted the handle_forwarded_room_key branch November 8, 2017 10:26
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

2 participants