Skip to content

Commit 128f06b

Browse files
committed
Update matrix-rust-sdk to 777ce05
1 parent ae5f803 commit 128f06b

4 files changed

Lines changed: 51 additions & 38 deletions

File tree

CHANGELOG.md

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

3+
- Update matrix-rust-sdk to `777ce05`:
4+
5+
- Update to vodozemac 0.10.0 making the `PkEncryption::encrypt` API fallible
6+
[#6477](https://github.com/matrix-org/matrix-rust-sdk/pull/6477)
7+
38
# matrix-sdk-crypto-wasm v18.2.0
49

510
- Update matrix-rust-sdk to `c7d44dd`:

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ futures-util = "0.3.27"
6464
getrandom = { version = "0.3.0", features = ["wasm_js"] }
6565
http = "1.1.0"
6666
js-sys = "0.3.91"
67-
matrix-sdk-common = { features = ["js", "experimental-encrypted-state-events"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "c7d44dd" }
68-
matrix-sdk-indexeddb = { default-features = false, features = ["e2e-encryption"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "c7d44dd" }
69-
matrix-sdk-qrcode = { optional = true, git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "c7d44dd" }
67+
matrix-sdk-common = { features = ["js", "experimental-encrypted-state-events"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "777ce05" }
68+
matrix-sdk-indexeddb = { default-features = false, features = ["e2e-encryption"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "777ce05" }
69+
matrix-sdk-qrcode = { optional = true, git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "777ce05" }
7070
serde = "1.0.91"
7171
serde_json = "1.0.91"
7272
serde-wasm-bindgen = "0.6.5"
@@ -86,7 +86,7 @@ vergen-gitcl = { version = "1.0.0", features = ["build"] }
8686
default-features = false
8787
features = ["js", "automatic-room-key-forwarding", "experimental-encrypted-state-events", "experimental-push-secrets"]
8888
git = "https://github.com/matrix-org/matrix-rust-sdk"
89-
rev = "c7d44dd"
89+
rev = "777ce05"
9090

9191
[lints.rust]
9292
# Workaround for https://github.com/rustwasm/wasm-bindgen/issues/4283, while we work up the courage to upgrade

src/vodozemac/pk_encryption.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ impl PkEncryption {
117117
}
118118

119119
/// Encrypts a byte message and returns an encrypted {@link PkMessage}.
120-
pub fn encrypt(&self, message: &[u8]) -> PkMessage {
121-
PkMessage { inner: self.inner.encrypt(message) }
120+
pub fn encrypt(&self, message: &[u8]) -> Result<PkMessage, JsError> {
121+
Ok(PkMessage { inner: self.inner.encrypt(message)? })
122122
}
123123

124124
/// Encrypts a string message and returns an encrypted {@link PkMessage}.
125125
#[wasm_bindgen(js_name = "encryptString")]
126-
pub fn encrypt_string(&self, message: &str) -> PkMessage {
126+
pub fn encrypt_string(&self, message: &str) -> Result<PkMessage, JsError> {
127127
self.encrypt(message.as_bytes())
128128
}
129129
}

0 commit comments

Comments
 (0)