diff --git a/Cargo.lock b/Cargo.lock index e672d18..2694031 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1113,9 +1113,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openmls" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63c0968d4ec14a79259ad7287b03da934ffecd7cddacf9054224cafe8a9aa7" +checksum = "7af47d535cef7b75806a2b5fcf81ba8e68179f5923aca9bc6a4d8d563e4f8757" dependencies = [ "fluvio-wasm-timer", "getrandom 0.2.16", @@ -1123,15 +1123,17 @@ dependencies = [ "openmls_traits", "rayon", "serde", + "serde_bytes", "thiserror", "tls_codec", + "zeroize", ] [[package]] name = "openmls_basic_credential" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef01a72cab1d27a047d47ef3f084f049c2b25a081cd996d3a8904ed16fd523f8" +checksum = "e3e6454b2b1b6749fc2f142d7f74eb387f7793be88187ed372e9f5f4cf10c34c" dependencies = [ "ed25519-dalek", "openmls_traits", @@ -1143,9 +1145,9 @@ dependencies = [ [[package]] name = "openmls_memory_storage" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ef51988f762610917d071606ec641c6e8007262589634f7b8e77b35ded7423" +checksum = "9e7b071ea5573a97efaa72b7c53e81cebc644b62ef0fe992bad685cc0f7dd4ea" dependencies = [ "log", "openmls_traits", @@ -1156,9 +1158,9 @@ dependencies = [ [[package]] name = "openmls_rust_crypto" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08aebf5bf9ed2ab567b253e6d1b93a5c11e0ce456fe2f8761d80b88a0a90ae0" +checksum = "3faef09e17a15c8065b9ec6b1e150c19dcb0c4cb810a636b6f010a94a189678e" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1181,9 +1183,9 @@ dependencies = [ [[package]] name = "openmls_traits" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50a33e77f6bb34610f7b10548518abe22858c194d3c994670931510530a74" +checksum = "e21d8877bacdbc407060df29bf59b145bb886a8fa0099b87ae8067a34b902a13" dependencies = [ "serde", "tls_codec", @@ -1611,18 +1613,38 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" +dependencies = [ + "serde", + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", diff --git a/davey/Cargo.toml b/davey/Cargo.toml index c841903..6030f75 100644 --- a/davey/Cargo.toml +++ b/davey/Cargo.toml @@ -10,9 +10,9 @@ keywords = ["MLS", "Encryption", "E2EE", "Discord", "DAVE"] edition = "2024" [dependencies] -openmls = { features = ["js"], version = "0.7.0" } -openmls_basic_credential = "0.4.0" -openmls_rust_crypto = "0.4.0" +openmls = { features = ["js"], version = "=0.7.1" } +openmls_basic_credential = "=0.4.1" +openmls_rust_crypto = "=0.4.1" tracing = "0.1.41" thiserror = "2.0.12" # Crypto utils @@ -40,4 +40,4 @@ pyo3 = { version = "0.25.0", optional = true } [features] default = [] napi = ["dep:napi", "dep:napi-derive"] -pyo3 = ["dep:pyo3"] \ No newline at end of file +pyo3 = ["dep:pyo3"] diff --git a/davey/src/errors.rs b/davey/src/errors.rs index 07ea50e..3b634eb 100644 --- a/davey/src/errors.rs +++ b/davey/src/errors.rs @@ -108,7 +108,7 @@ pub enum ProcessProposalsError { #[error("message was not a private or public message: {0}")] MessageNotPrivateOrPublic(#[from] ProtocolMessageError), #[error("failed to process message: {0}")] - MessageProcessingFailed(#[from] ProcessMessageError), + MessageProcessingFailed(#[from] ProcessMessageError), #[error("failed to convert credential content to user id: {0}")] CredentialContentConvertFailed(TryFromSliceError), #[error("unexpected user in add proposal: {0}")] @@ -166,7 +166,7 @@ pub enum ProcessCommitError { #[error("failed to merge staged commit: {0}")] MergingStagedCommitFailed(#[from] MergeCommitError), #[error("failed to merge staged commit: {0}")] - ProcessingMessageFailed(#[from] ProcessMessageError), + ProcessingMessageFailed(#[from] ProcessMessageError), #[error("processed message was not a staged commit")] ProcessedMessageNotStagedCommit, #[error("failed to update ratchets: {0}")]