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

libolm_migration: make sender_signing_key optional #89

Merged
merged 2 commits into from
Jan 22, 2024
Merged

libolm_migration: make sender_signing_key optional #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f434fd
libolm_migration: make `sender_signing_key` optional
richvdh Jan 21, 2024
091093c
fix typo
richvdh Jan 22, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# UNRELEASED

- `PickledInboundGroupSession.sender_signing_key` is now optional.
([#89](https://github.com/matrix-org/matrix-rust-sdk-crypto-wasm/pull/89))

# matrix-sdk-crypto-wasm v4.0.0

**BREAKING CHANGES**
Expand Down
33 changes: 24 additions & 9 deletions src/libolm_migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

//! Migration from libolm to Vodozemac.

use std::{iter, time::Duration};
use std::time::Duration;

use anyhow::Context;
use js_sys::{Date, Uint8Array};
Expand All @@ -24,7 +24,7 @@ use matrix_sdk_common::ruma::{
use matrix_sdk_crypto::{
olm::PrivateCrossSigningIdentity,
store::{BackupDecryptionKey, Changes, DynCryptoStore, PendingChanges},
types::EventEncryptionAlgorithm,
types::{EventEncryptionAlgorithm, SigningKeys},
vodozemac,
vodozemac::{Curve25519PublicKey, Ed25519PublicKey},
Session,
Expand Down Expand Up @@ -324,9 +324,22 @@ pub struct PickledInboundGroupSession {
#[wasm_bindgen(js_name = "senderKey")]
pub sender_key: String,

/// The public ed25519 key of the account that sent us the session.
/// 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-encrypted `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
#[wasm_bindgen(js_name = "senderSigningKey")]
pub sender_signing_key: String,
pub sender_signing_key: Option<String>,

/// The id of the room that the session is used in.
///
Expand Down Expand Up @@ -408,14 +421,16 @@ fn libolm_pickled_megolm_session_to_rust_pickled_session(

let sender_key = Curve25519PublicKey::from_base64(&libolm_session.sender_key)?;

let mut sender_signing_keys = SigningKeys::new();
if let Some(key) = libolm_session.sender_signing_key {
sender_signing_keys
.insert(DeviceKeyAlgorithm::Ed25519, Ed25519PublicKey::from_base64(&key)?.into());
}

Ok(matrix_sdk_crypto::olm::PickledInboundGroupSession {
pickle,
sender_key,
signing_key: iter::once((
DeviceKeyAlgorithm::Ed25519,
Ed25519PublicKey::from_base64(&libolm_session.sender_signing_key)?.into(),
))
.collect(),
signing_key: sender_signing_keys,
room_id: libolm_session
.room_id
.clone()
Expand Down