From 0cae8a2fc8d1433ab610c3a536aed29f3c0d7126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 7 May 2026 13:13:34 +0200 Subject: [PATCH] Update matrix-rust-sdk to 777ce05 --- CHANGELOG.md | 5 +++ Cargo.lock | 70 +++++++++++++++++++--------------- Cargo.toml | 8 ++-- src/vodozemac/pk_encryption.rs | 6 +-- 4 files changed, 51 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb6ce0522..4f21ee645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # UNRELEASED +- Update matrix-rust-sdk to `777ce05`: + + - Update to vodozemac 0.10.0 making the `PkEncryption::encrypt` API fallible + [#6477](https://github.com/matrix-org/matrix-rust-sdk/pull/6477) + # matrix-sdk-crypto-wasm v18.2.0 - Update matrix-rust-sdk to `c7d44dd`: diff --git a/Cargo.lock b/Cargo.lock index dce483e62..0519ec38b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1277,7 +1277,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=c7d44dd#c7d44ddad3f85492c07631049a414c34f1f72f07" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=777ce05#777ce05b2b3fa8073c9620d5eaf4667bd15b1985" dependencies = [ "as_variant", "async-trait", @@ -1303,7 +1303,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=c7d44dd#c7d44ddad3f85492c07631049a414c34f1f72f07" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=777ce05#777ce05b2b3fa8073c9620d5eaf4667bd15b1985" dependencies = [ "eyeball-im", "futures-core", @@ -1326,7 +1326,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=c7d44dd#c7d44ddad3f85492c07631049a414c34f1f72f07" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=777ce05#777ce05b2b3fa8073c9620d5eaf4667bd15b1985" dependencies = [ "aes", "aquamarine", @@ -1394,7 +1394,7 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=c7d44dd#c7d44ddad3f85492c07631049a414c34f1f72f07" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=777ce05#777ce05b2b3fa8073c9620d5eaf4667bd15b1985" dependencies = [ "async-trait", "base64", @@ -1425,7 +1425,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=c7d44dd#c7d44ddad3f85492c07631049a414c34f1f72f07" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=777ce05#777ce05b2b3fa8073c9620d5eaf4667bd15b1985" dependencies = [ "byteorder", "qrcode", @@ -1437,11 +1437,12 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=c7d44dd#c7d44ddad3f85492c07631049a414c34f1f72f07" +source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=777ce05#777ce05b2b3fa8073c9620d5eaf4667bd15b1985" dependencies = [ "base64", "blake3", "chacha20poly1305", + "getrandom 0.2.17", "getrandom 0.4.2", "hmac", "pbkdf2", @@ -1752,9 +1753,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" dependencies = [ "bytes", "prost-derive", @@ -1762,12 +1763,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.117", @@ -1959,8 +1960,9 @@ dependencies = [ [[package]] name = "ruma" -version = "0.14.1" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e420da038fd6529af5abffe21df50ba122e1b4a84db05c02ec05b5ab0a21a320" dependencies = [ "assign", "js_int", @@ -1974,8 +1976,9 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.22.1" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a793e13cc9c354385e4f635b5eca581abe76169a9fafd8c530918f9b19f8d63" dependencies = [ "as_variant", "assign", @@ -1996,21 +1999,22 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.17.1" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69b11cb6ccf0e27c3c44c50e2e4799337921c66d4e6a490c084f18c5b4481ec" dependencies = [ "as_variant", "base64", "bytes", "date_header", "form_urlencoded", - "getrandom 0.2.17", + "getrandom 0.4.2", "http", "indexmap", "js_int", "konst", "percent-encoding", - "rand 0.8.6", + "rand 0.10.1", "regex", "ruma-identifiers-validation", "ruma-macros", @@ -2029,8 +2033,9 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.32.1" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c96e3c39ab1b692086d02513fe0c24400d864060880bbd2716cb5544f5923131" dependencies = [ "as_variant", "indexmap", @@ -2049,8 +2054,9 @@ dependencies = [ [[package]] name = "ruma-html" -version = "0.6.0" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1d81a7300e8623dbf5e6d73e700f0277fce6824849d77779ed997ec4e280b97" dependencies = [ "as_variant", "html5ever", @@ -2060,8 +2066,9 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" -version = "0.12.0" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6cff00317675f487c4e7ccfb18875a14c5a14867b51d13f2a826053f03c432" dependencies = [ "js_int", "thiserror", @@ -2069,8 +2076,9 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.17.1" -source = "git+https://github.com/ruma/ruma?rev=7680eebd9586669e1a4e5b1fd1c2c691221369d4#7680eebd9586669e1a4e5b1fd1c2c691221369d4" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac022103cd7829721476d3df79d16125be159e99527c8ddb27f125e7b674e5c" dependencies = [ "as_variant", "cfg-if", @@ -2189,9 +2197,9 @@ dependencies = [ [[package]] name = "serde_html_form" -version = "0.2.8" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f2d7ff8a2140333718bb329f5c40fc5f0865b84c426183ce14c97d2ab8154f" +checksum = "0946d52b4b7e28823148aebbeceb901012c595ad737920d504fa8634bb099e6f" dependencies = [ "form_urlencoded", "indexmap", @@ -2740,9 +2748,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vodozemac" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022a277687e4e8685d72b95a7ca3ccfec907daa946678e715f8badaa650883d" +checksum = "b98bf83c0992966775b8012f194b07b44928996163e5a05b741b43891571ae5b" dependencies = [ "aes", "arrayvec", diff --git a/Cargo.toml b/Cargo.toml index efbd79f20..fdbf935b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,9 +64,9 @@ futures-util = "0.3.27" getrandom = { version = "0.3.0", features = ["wasm_js"] } http = "1.1.0" js-sys = "0.3.91" -matrix-sdk-common = { features = ["js", "experimental-encrypted-state-events"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "c7d44dd" } -matrix-sdk-indexeddb = { default-features = false, features = ["e2e-encryption"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "c7d44dd" } -matrix-sdk-qrcode = { optional = true, git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "c7d44dd" } +matrix-sdk-common = { features = ["js", "experimental-encrypted-state-events"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "777ce05" } +matrix-sdk-indexeddb = { default-features = false, features = ["e2e-encryption"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "777ce05" } +matrix-sdk-qrcode = { optional = true, git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "777ce05" } serde = "1.0.91" serde_json = "1.0.91" serde-wasm-bindgen = "0.6.5" @@ -86,7 +86,7 @@ vergen-gitcl = { version = "1.0.0", features = ["build"] } default-features = false features = ["js", "automatic-room-key-forwarding", "experimental-encrypted-state-events", "experimental-push-secrets"] git = "https://github.com/matrix-org/matrix-rust-sdk" -rev = "c7d44dd" +rev = "777ce05" [lints.rust] # Workaround for https://github.com/rustwasm/wasm-bindgen/issues/4283, while we work up the courage to upgrade diff --git a/src/vodozemac/pk_encryption.rs b/src/vodozemac/pk_encryption.rs index fbce5e325..556f8b03c 100644 --- a/src/vodozemac/pk_encryption.rs +++ b/src/vodozemac/pk_encryption.rs @@ -117,13 +117,13 @@ impl PkEncryption { } /// Encrypts a byte message and returns an encrypted {@link PkMessage}. - pub fn encrypt(&self, message: &[u8]) -> PkMessage { - PkMessage { inner: self.inner.encrypt(message) } + pub fn encrypt(&self, message: &[u8]) -> Result { + Ok(PkMessage { inner: self.inner.encrypt(message)? }) } /// Encrypts a string message and returns an encrypted {@link PkMessage}. #[wasm_bindgen(js_name = "encryptString")] - pub fn encrypt_string(&self, message: &str) -> PkMessage { + pub fn encrypt_string(&self, message: &str) -> Result { self.encrypt(message.as_bytes()) } }