t/crdt-enc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: update cargo deps

Browse Source
This commit is contained in:
Thomas Heck
2022-12-22 20:22:28 +01:00
parent 60bc7c657a
commit 6f388ce310
9 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crdt-enc-gpgme/Cargo.toml
View File

@@ -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"

2
crdt-enc-tokio/Cargo.toml
View File

@@ -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"

6
crdt-enc-xchacha20poly1305/Cargo.toml
View File

@@ -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"]

9
crdt-enc-xchacha20poly1305/src/lib.rs
View File

@@ -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"));

6
crdt-enc/Cargo.toml
View File

@@ -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"]

15
crdt-enc/src/lib.rs
View File

@@ -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<S> = rmp_serde::from_read_ref(&clear_text)?;
let state_wrapper: StateWrapper<S> =
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))
})

7
crdt-enc/src/utils.rs
View File

@@ -43,7 +43,8 @@ pub fn decode_version_bytes_mvreg<T: DeserializeOwned + CvRDT + Default>(
.into_iter()
.try_fold(T::default(), |mut acc, vb| -> Result<T> {
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)
})

2
crdt-enc/src/utils/version_bytes.rs
View File

@@ -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],
}

2
examples/test/Cargo.toml
View File

@@ -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"