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 #468

Merged
merged 7 commits into from
Jun 20, 2017

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jun 20, 2017

This is a re-working of #455.

When we get aan 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.

There is some preparatory work in a number the earlier commits - it is worth looking at them separately.

These terms were somewhat confusing (and, in the case of megolm, misleading),
so replace them with explicit senderCurve25519Key and claimedEd25519Key fields.
Rearrange the way _getInboundGroupSession and _saveInboundGroupSession work, so
that we can add more things to the storage without growing the parameter list
forever.
I'm going to introduce some separate unit tests, so let's give this a different
filename to reduce confusion.
not much here yet, but it's a start at least.
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.
Copy link
Contributor

@NegativeMjark NegativeMjark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@richvdh richvdh merged commit 8c9150d into room_key_sharing Jun 20, 2017
@richvdh richvdh deleted the rav/handle_forwarded_room_key_2 branch June 20, 2017 21:57
ylecollen pushed a commit to matrix-org/matrix-android-sdk that referenced this pull request Oct 25, 2017
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