Skip to content

MSC4147: Including device keys with Olm-encrypted events #4147

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

Merged
richvdh merged 12 commits into from
Dec 10, 2024
Merged

MSC4147: Including device keys with Olm-encrypted events #4147

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce31f30
initial version of including device keys with olm-encrypted events
uhoreg May 29, 2024
4fa6b3f
use MSC number
uhoreg May 29, 2024
62352ca
fix typo
uhoreg May 29, 2024
419bed3
indicate what should happen if keys differ
uhoreg Jun 10, 2024
33bb7c2
Apply suggestions from code review
uhoreg Oct 17, 2024
04acb6b
switch to versioned spec links
richvdh Nov 1, 2024
407e1d9
Clarify the problem being solved
richvdh Nov 1, 2024
5bb2093
another reason to encrypt device_keys
richvdh Nov 1, 2024
0deb58f
Document alternative approach properly
richvdh Nov 1, 2024
28d03f5
minor edits
richvdh Nov 2, 2024
c7ff262
device_keys -> sender_device_keys
richvdh Nov 27, 2024
ca11f99
event -> to-device message, in various places
richvdh Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use MSC number
  • Loading branch information
@uhoreg
uhoreg committed May 29, 2024
commit 4fa6b3fc7f2e79b8c4660031ca5f1f254ebb87d2
4 changes: 2 additions & 2 deletions ...-device-keys-with-olm-encrypted-events.md → ...-device-keys-with-olm-encrypted-events.md
View file
Open in desktop
Copy link
Member

@turt2live turt2live May 29, 2024 •
edited by richvdh
Loading

Choose a reason for hiding this comment

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

Implementation requirements:

  • Client sending this information
  • Client using this information
  • Demonstration of the core problem being solved (likely covered by the above tasks)

Copy link
Member Author

@uhoreg uhoreg Oct 18, 2024

Choose a reason for hiding this comment

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

This has been implemented in the Rust matrix-sdk-crypto crate, both sending and using. Demonstration of the problem being solved: https://youtu.be/b1jJlT2ENT8?feature=shared&t=345

Copy link
Member

@richvdh richvdh Nov 2, 2024

Choose a reason for hiding this comment

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

A few links to the implementation.

On the sender side, the field is added here.

On the receiver side, it is deserialized after decryption into a DecryptedOlmV1Event. It is then used in SenderDataFinder whose job it is to construct a SenderData which records our knowledge about the sending device for a given session.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MSCxxxx: Including device keys with Olm-encrypted events
# MSC4147: Including device keys with Olm-encrypted events

When a Megolm session is sent from one device to another via Olm, the recipient
can
Expand Down Expand Up @@ -128,7 +128,7 @@ came from a deleted device.
## Unstable prefix

Until this MSC is accepted, the new property should be named
`org.matrix.mscxxxx.device_keys`.
`org.matrix.msc4147.device_keys`.

## Dependencies

Expand Down