Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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`:
Expand Down
70 changes: 39 additions & 31 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/vodozemac/pk_encryption.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PkMessage, JsError> {
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<PkMessage, JsError> {
self.encrypt(message.as_bytes())
}
}
Expand Down
Loading