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.

Sign up for GitHub

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

Jump to bottom

Handle m.forwarded_room_key events #404

Merged
merged 4 commits into from
Nov 7, 2017
Merged

Handle m.forwarded_room_key events #404

merged 4 commits into from
Nov 7, 2017

Commits on Nov 7, 2017

  1. Crypto: API break in MXEvent: Replace keysProved and keysClaimed. 

    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
    @manuroe
    manuroe committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    04a4e1e View commit details
    Browse the repository at this point in the history

  2. Crypto: MXEvent: Add support for forwardingCurve25519KeyChain. 

    Port of matrix-org/matrix-js-sdk@cfa871c
    @manuroe
    manuroe committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    8b99a03 View commit details
    Browse the repository at this point in the history

  3. MXCrypto: Add support for forwarding room keys to megolm 

    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 committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    508d0ad View commit details
    Browse the repository at this point in the history

  4. MXCrypto: Add support for forwarding room keys to megolm 

    Fix typo
    @manuroe
    manuroe committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    5904cbf View commit details
    Browse the repository at this point in the history