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

Process received room key requests #449

Merged
merged 4 commits into from
Jun 6, 2017
Merged

Process received room key requests #449

merged 4 commits into from
Jun 6, 2017

Commits on Jun 1, 2017

  1. Processing of received room key requests 

    Doesn't actually do any of the crypto magic yet.
    @richvdh
    richvdh committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    c8eca50 View commit details
    Browse the repository at this point in the history

  2. Room key request cancellation handling

    @richvdh
    richvdh committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    2daa395 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. Address review comments 

    Avoid gut-wrenching properties on IncomingRoomKeyRequest.
    @richvdh
    richvdh committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    1664312 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. Merge branch 'room_key_sharing' into rav/handle_room_key_requests

    @richvdh
    richvdh committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    ab7e0a9 View commit details
    Browse the repository at this point in the history