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

Use the dehydrated device format implemented by vodozemac #4421

Merged
merged 10 commits into from
Jan 22, 2025
Merged

Use the dehydrated device format implemented by vodozemac #4421

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5563c2
use the dehydrated device format implemented by vodozemac
uhoreg Dec 16, 2024
0323681
Merge branch 'main' into dehydration_format
uhoreg Dec 16, 2024
b0dd695
make it work with latest main, and fmt
uhoreg Dec 17, 2024
faaadee
update to latest vodozemac and ruma changes, to support newer format
uhoreg Jan 3, 2025
cb50e36
Merge branch 'main' into dehydration_format
uhoreg Jan 9, 2025
ecff934
don't need to specify branch for ruma any more
uhoreg Jan 9, 2025
b94bebb
update to latest version of vodozemac branch
uhoreg Jan 9, 2025
e042193
update ffi to use new dehydration errors
uhoreg Jan 9, 2025
1e91b1e
bump vodozemac dependency to main branch instead of fork
uhoreg Jan 20, 2025
86a89f2
allow vodozemac git
uhoreg Jan 22, 2025
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
67 changes: 33 additions & 34 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ uniffi = { version = "0.28.0" }
uniffi_bindgen = { version = "0.28.0" }
url = "2.5.4"
uuid = "1.11.0"
vodozemac = { version = "0.8.1", features = ["insecure-pk-encryption"] }
vodozemac = { git = "https://github.com/matrix-org/vodozemac", rev = "3d655add09992d17fdb2b55c60f532658090487d", features = ["insecure-pk-encryption"] }
wasm-bindgen = "0.2.84"
wasm-bindgen-test = "0.3.33"
web-sys = "0.3.69"
Expand Down
7 changes: 6 additions & 1 deletion bindings/matrix-sdk-crypto-ffi/src/dehydrated_devices.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ use crate::{CryptoStoreError, DehydratedDeviceKey};
#[uniffi(flat_error)]
pub enum DehydrationError {
#[error(transparent)]
Pickle(#[from] matrix_sdk_crypto::vodozemac::LibolmPickleError),
Pickle(#[from] matrix_sdk_crypto::vodozemac::DehydratedDeviceError),
#[error(transparent)]
LegacyPickle(#[from] matrix_sdk_crypto::vodozemac::LibolmPickleError),
#[error(transparent)]
MissingSigningKey(#[from] matrix_sdk_crypto::SignatureError),
#[error(transparent)]
Expand All @@ -35,6 +37,9 @@ impl From<matrix_sdk_crypto::dehydrated_devices::DehydrationError> for Dehydrati
match value {
matrix_sdk_crypto::dehydrated_devices::DehydrationError::Json(e) => Self::Json(e),
matrix_sdk_crypto::dehydrated_devices::DehydrationError::Pickle(e) => Self::Pickle(e),
matrix_sdk_crypto::dehydrated_devices::DehydrationError::LegacyPickle(e) => {
Self::LegacyPickle(e)
}
matrix_sdk_crypto::dehydrated_devices::DehydrationError::MissingSigningKey(e) => {
Self::MissingSigningKey(e)
}
Expand Down
Loading
Loading