build: update cargo deps

This commit is contained in:
2022-12-22 20:22:28 +01:00
parent 60bc7c657a
commit 6f388ce310
9 changed files with 26 additions and 31 deletions

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

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