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

libolm_migration: make sender_signing_key optional #89

Merged
merged 2 commits into from
Jan 22, 2024

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jan 21, 2024

Empirically, some sessions in the legacy store lack a keysClaimed property. In order to accommodate such sessions in the import, we make the property optional.

Empirically, some sessions in the legacy store lack a `keysClaimed`
property. In order to accommodate such sessions in the import, we make the
property optional.
@richvdh richvdh requested a review from a team as a code owner January 21, 2024 22:26
@richvdh richvdh requested a review from BillCarsonFr January 21, 2024 22:26
@richvdh
Copy link
Member Author

richvdh commented Jan 21, 2024

Part of the fix to element-hq/element-web#26894

Comment on lines 327 to 340
/// The public ed25519 key of the account that is believed to have initiated
/// the session, if known.
///
/// If the session was received directly from the creator via an
/// Olm-encrypte `m.room_key` event, this value is taken from the `keys`
/// property of the plaintext payload of that event (see
/// [`m.olm.v1.curve25519-aes-sha2`]).
///
/// If the session was forwarded to us using an [`m.forwarded_room_key`],
/// this value is a copy of the `sender_claimed_ed25519_key` from the
/// content of the event.
///
/// [`m.olm.v1.curve25519-aes-sha2`]: https://spec.matrix.org/v1.9/client-server-api/#molmv1curve25519-aes-sha2
/// [`m.forwarded_room_key`]: https://spec.matrix.org/v1.9/client-server-api/#mforwarded_room_key
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the great comment 🙂.

src/libolm_migration.rs Outdated Show resolved Hide resolved
@Hywan Hywan merged commit 657cae3 into main Jan 22, 2024
3 checks passed
@Hywan Hywan deleted the rav/optional_sender_signing_key branch January 22, 2024 10:49
richvdh added a commit that referenced this pull request Jan 22, 2024
richvdh added a commit to matrix-org/matrix-js-sdk that referenced this pull request Jan 22, 2024
Fixes element-hq/element-web#26894

Requires matrix-org/matrix-rust-sdk-crypto-wasm#89 (or
rather, an update to a version of matrix-rust-sdk-crypto-wasm) which includes
it).
github-merge-queue bot pushed a commit to matrix-org/matrix-js-sdk that referenced this pull request Jan 24, 2024
Fixes element-hq/element-web#26894

Requires matrix-org/matrix-rust-sdk-crypto-wasm#89 (or
rather, an update to a version of matrix-rust-sdk-crypto-wasm) which includes
it).
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.

2 participants