From 6f388ce31091aef970b117ebb011f7ae90dbebe0 Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Thu, 22 Dec 2022 20:22:28 +0100 Subject: [PATCH] build: update cargo deps --- crdt-enc-gpgme/Cargo.toml | 8 ++++---- crdt-enc-tokio/Cargo.toml | 2 +- crdt-enc-xchacha20poly1305/Cargo.toml | 6 +++--- crdt-enc-xchacha20poly1305/src/lib.rs | 9 +++------ crdt-enc/Cargo.toml | 6 +++--- crdt-enc/src/lib.rs | 15 ++++++--------- crdt-enc/src/utils.rs | 7 ++++--- crdt-enc/src/utils/version_bytes.rs | 2 +- examples/test/Cargo.toml | 2 +- 9 files changed, 26 insertions(+), 31 deletions(-) diff --git a/crdt-enc-gpgme/Cargo.toml b/crdt-enc-gpgme/Cargo.toml index 88eb7b9..3fbfa07 100644 --- a/crdt-enc-gpgme/Cargo.toml +++ b/crdt-enc-gpgme/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = "1" serde_bytes = "0.11" -rmp-serde = "0.15" +rmp-serde = "1" async-trait = "0.1" anyhow = "1" -uuid = "0.8" +uuid = "1" crdts = "7" -gpgme = "0.10" +gpgme = "0.11" dyn-clone = "1" -phf = {version = "0.10", features = ["macros"]} +phf = {version = "0.11", features = ["macros"]} [dependencies.crdt-enc] path = "../crdt-enc" diff --git a/crdt-enc-tokio/Cargo.toml b/crdt-enc-tokio/Cargo.toml index 8b9268e..d3d673e 100644 --- a/crdt-enc-tokio/Cargo.toml +++ b/crdt-enc-tokio/Cargo.toml @@ -10,7 +10,7 @@ serde = "1" async-trait = "=0.1.42" # https://github.com/dtolnay/async-trait/issues/144 futures = "0.3" anyhow = "1" -uuid = "0.8" +uuid = "1" data-encoding = "2" bytes = "1" diff --git a/crdt-enc-xchacha20poly1305/Cargo.toml b/crdt-enc-xchacha20poly1305/Cargo.toml index a31d0fc..8f504f2 100644 --- a/crdt-enc-xchacha20poly1305/Cargo.toml +++ b/crdt-enc-xchacha20poly1305/Cargo.toml @@ -9,9 +9,9 @@ crdts = "7" rand = "0.8" anyhow = "1" serde = "1" -rmp-serde = "0.15" +rmp-serde = "1" serde_bytes = "0.11" -uuid = "0.8" +uuid = "1" async-trait = "0.1" agnostik = "0.2" @@ -19,5 +19,5 @@ agnostik = "0.2" path = "../crdt-enc" [dependencies.chacha20poly1305] -version = "0.8" +version = "0.10" features = ["std"] diff --git a/crdt-enc-xchacha20poly1305/src/lib.rs b/crdt-enc-xchacha20poly1305/src/lib.rs index 34643e1..23259c2 100644 --- a/crdt-enc-xchacha20poly1305/src/lib.rs +++ b/crdt-enc-xchacha20poly1305/src/lib.rs @@ -1,10 +1,7 @@ use ::agnostik::spawn_blocking; use ::anyhow::{Context, Error, Result}; use ::async_trait::async_trait; -use ::chacha20poly1305::{ - aead::{Aead, NewAead}, - Key, XChaCha20Poly1305, XNonce, -}; +use ::chacha20poly1305::{aead::Aead, Key, KeyInit, XChaCha20Poly1305, XNonce}; use ::crdt_enc::utils::{VersionBytes, VersionBytesRef}; use ::rand::{thread_rng, RngCore}; use ::serde::{Deserialize, Serialize}; @@ -83,11 +80,11 @@ impl crdt_enc::cryptor::Cryptor for EncHandler { spawn_blocking(move || { let version_box: VersionBytesRef = - rmp_serde::from_read_ref(&enc_data).context("failed to parse version box")?; + rmp_serde::from_slice(&enc_data).context("failed to parse version box")?; version_box .ensure_version(DATA_VERSION) .context("not matching version of encryption box")?; - let enc_box: EncBox = rmp_serde::from_read_ref(version_box.as_ref()) + let enc_box: EncBox = rmp_serde::from_slice(version_box.as_ref()) .context("failed to parse encryption box")?; if enc_box.nonce.as_ref().len() != NONCE_LEN { return Err(Error::msg("Invalid nonce length")); diff --git a/crdt-enc/Cargo.toml b/crdt-enc/Cargo.toml index 2652f10..3d907a7 100644 --- a/crdt-enc/Cargo.toml +++ b/crdt-enc/Cargo.toml @@ -8,15 +8,15 @@ edition = "2018" crdts = "7" serde = "1" serde_bytes = "0.11" -rmp-serde = "0.15" +rmp-serde = "1" async-trait = "0.1" anyhow = "1" thiserror = "1" futures = "0.3" dyn-clone = "1" bytes = "1" -phf = {version = "0.10", features = ["macros"]} +phf = {version = "0.11", features = ["macros"]} [dependencies.uuid] -version = "0.8" +version = "1" features = ["serde", "v4"] diff --git a/crdt-enc/src/lib.rs b/crdt-enc/src/lib.rs index ce03f59..20c58f3 100644 --- a/crdt-enc/src/lib.rs +++ b/crdt-enc/src/lib.rs @@ -255,7 +255,7 @@ where let local_meta: LocalMeta = match local_meta { Some(local_meta) => { local_meta.ensure_versions_phf(&SUPPORTED_VERSIONS)?; - rmp_serde::from_read_ref(&local_meta)? + rmp_serde::from_slice(local_meta.as_ref())? } None => { if !options.create { @@ -443,7 +443,8 @@ where let clear_text = VersionBytesRef::deserialize(&clear_text)?; clear_text.ensure_versions(&self.supported_data_versions)?; - let state_wrapper: StateWrapper = rmp_serde::from_read_ref(&clear_text)?; + let state_wrapper: StateWrapper = + rmp_serde::from_slice(clear_text.as_ref())?; Result::<_>::Ok((name, state_wrapper)) } @@ -498,16 +499,12 @@ where let key = key.clone(); async move { data.ensure_versions_phf(&SUPPORTED_VERSIONS)?; - let clear_text = self - .cryptor - .decrypt(key.key(), data.into()) - .await - .unwrap(); + let clear_text = self.cryptor.decrypt(key.key(), data.into()).await.unwrap(); let clear_text = VersionBytesRef::deserialize(&clear_text)?; clear_text.ensure_versions(&self.supported_data_versions)?; - let ops: Vec<_> = rmp_serde::from_read_ref(&clear_text)?; + let ops: Vec<_> = rmp_serde::from_slice(clear_text.as_ref())?; Result::<_, Error>::Ok((actor, version, ops)) } @@ -577,7 +574,7 @@ where .map(|(name, vbox)| { vbox.ensure_versions_phf(&SUPPORTED_VERSIONS)?; - let remote_meta: RemoteMeta = rmp_serde::from_read_ref(&vbox)?; + let remote_meta: RemoteMeta = rmp_serde::from_slice(vbox.as_ref())?; Ok((name, remote_meta)) }) diff --git a/crdt-enc/src/utils.rs b/crdt-enc/src/utils.rs index a800020..a4ccf54 100644 --- a/crdt-enc/src/utils.rs +++ b/crdt-enc/src/utils.rs @@ -43,7 +43,8 @@ pub fn decode_version_bytes_mvreg( .into_iter() .try_fold(T::default(), |mut acc, vb| -> Result { vb.ensure_versions(supported_versions)?; - let keys = rmp_serde::from_read_ref(&vb).context("Could not parse msgpack value")?; + let keys = + rmp_serde::from_slice(vb.as_ref()).context("Could not parse msgpack value")?; acc.merge(keys); Ok(acc) }) @@ -77,7 +78,7 @@ where }) .try_buffer_unordered(16) .try_fold(T::default(), |mut acc, buf| async move { - let keys = rmp_serde::from_read_ref(&buf).context("Could not parse msgpack value")?; + let keys = rmp_serde::from_slice(&buf).context("Could not parse msgpack value")?; acc.merge(keys); Ok(acc) }) @@ -111,7 +112,7 @@ where }) .try_buffer_unordered(16) .try_fold(T::default(), |mut acc, buf| async move { - let keys = rmp_serde::from_read_ref(&buf).context("Could not parse msgpack value")?; + let keys = rmp_serde::from_slice(&buf).context("Could not parse msgpack value")?; acc.merge(keys); Ok(acc) }) diff --git a/crdt-enc/src/utils/version_bytes.rs b/crdt-enc/src/utils/version_bytes.rs index de4b7ac..9e45838 100644 --- a/crdt-enc/src/utils/version_bytes.rs +++ b/crdt-enc/src/utils/version_bytes.rs @@ -249,7 +249,7 @@ const VERSION_LEN: usize = 16; #[derive(Debug, Clone)] pub struct VersionBytesBuf<'a> { pos: usize, - version: [u8; VERSION_LEN], + version: uuid::Bytes, content: &'a [u8], } diff --git a/examples/test/Cargo.toml b/examples/test/Cargo.toml index d271e36..e23074d 100644 --- a/examples/test/Cargo.toml +++ b/examples/test/Cargo.toml @@ -9,7 +9,7 @@ crdt-enc = {path="../../crdt-enc"} crdt-enc-tokio = {path="../../crdt-enc-tokio"} crdt-enc-xchacha20poly1305 = {path="../../crdt-enc-xchacha20poly1305"} crdt-enc-gpgme = {path="../../crdt-enc-gpgme"} -uuid = {version = "0.8", features = ["serde", "v4"]} +uuid = {version = "1", features = ["serde", "v4"]} crdts = "7" tokio = {version = "1", features = ["macros", "rt"]} anyhow = "1"