Skip to content

Commit 64ca965

Browse files
poljarjplatte
andcommitted
Initial support for dehydrated devices
Co-authored-by: Jonas Platte <[email protected]>
1 parent 8ce3b56 commit 64ca965

File tree

9 files changed

+657
-57
lines changed

9 files changed

+657
-57
lines changed

Cargo.lock

Lines changed: 45 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ futures-executor = "0.3.21"
3434
futures-util = { version = "0.3.26", default-features = false, features = ["alloc"] }
3535
http = "0.2.6"
3636
itertools = "0.11.0"
37-
ruma = { git = "https://github.com/ruma/ruma", rev = "8b4ece2b0fa31be21eb1273a6e6bf32e09909480", features = ["client-api-c", "compat-upload-signatures", "compat-user-id"] }
38-
ruma-common = { git = "https://github.com/ruma/ruma", rev = "8b4ece2b0fa31be21eb1273a6e6bf32e09909480" }
37+
ruma = { git = "https://github.com/ruma/ruma", rev = "f1772ae5bc1d849655498f51b0fec7b0ef10e339", features = ["client-api-c", "compat-upload-signatures", "compat-user-id"] }
38+
ruma-common = { git = "https://github.com/ruma/ruma", rev = "f1772ae5bc1d849655498f51b0fec7b0ef10e339" }
3939
once_cell = "1.16.0"
4040
serde = "1.0.151"
4141
serde_html_form = "0.2.0"
@@ -46,7 +46,7 @@ tracing = { version = "0.1.36", default-features = false, features = ["std"] }
4646
tracing-core = "0.1.30"
4747
uniffi = { git = "https://github.com/Hywan/uniffi-rs", rev = "9e2ffac3e6c8dbad4dcd9c6339069ef31ef87a7b" }
4848
uniffi_bindgen = { git = "https://github.com/Hywan/uniffi-rs", rev = "9e2ffac3e6c8dbad4dcd9c6339069ef31ef87a7b" }
49-
vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "cedc9a08fdd8d0931ea778acf68c619a8298ee70" }
49+
vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "e3b658526f6f1dd0a9065c1c96346b796712c425" }
5050
zeroize = "1.6.0"
5151

5252
# Default release profile, select with `--release`

crates/matrix-sdk-crypto/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# unreleased
22

3+
- Add initial support for MSC3814 - dehydrated devices.
4+
35
- Mark our `OwnUserIdentity` as verified if we successfully import the matching
46
private keys.
57

crates/matrix-sdk-crypto/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ default = []
1919
automatic-room-key-forwarding = []
2020
js = ["ruma/js", "vodozemac/js"]
2121
qrcode = ["dep:matrix-sdk-qrcode"]
22-
backups_v1 = ["dep:bs58", "dep:cbc", "dep:hkdf"]
22+
backups_v1 = ["dep:bs58", "dep:cbc"]
2323
message-ids = ["dep:ulid"]
2424
experimental-algorithms = []
2525

@@ -41,7 +41,7 @@ dashmap = { workspace = true }
4141
eyeball = { workspace = true }
4242
futures-core = { workspace = true }
4343
futures-util = { workspace = true }
44-
hkdf = { version = "0.12.3", optional = true }
44+
hkdf = "0.12.3"
4545
hmac = "0.12.1"
4646
http = { workspace = true, optional = true } # feature = testing only
4747
itertools = { workspace = true }
@@ -50,7 +50,7 @@ matrix-sdk-common = { version = "0.6.0", path = "../matrix-sdk-common" }
5050
pbkdf2 = { version = "0.11.0", default-features = false }
5151
rand = "0.8.5"
5252
rmp-serde = "1.1.1"
53-
ruma = { workspace = true, features = ["rand", "canonical-json"] }
53+
ruma = { workspace = true, features = ["rand", "canonical-json", "unstable-msc3814"] }
5454
serde = { workspace = true, features = ["derive", "rc"] }
5555
serde_json = { workspace = true }
5656
sha2 = "0.10.2"

0 commit comments

Comments
 (0)