diff --git a/Cargo.lock b/Cargo.lock index 00c30ba..2b2c747 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,6 +765,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie-factory" version = "0.3.3" @@ -933,21 +942,23 @@ dependencies = [ [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b" dependencies = [ + "convert_case", "proc-macro2", "quote", + "rustc_version", "syn", "unicode-xid", ] @@ -1050,7 +1061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2419,7 +2430,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2432,7 +2443,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.9.2", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2951,7 +2962,7 @@ dependencies = [ "getrandom 0.3.1", "once_cell", "rustix 1.0.1", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -3278,6 +3289,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-width" version = "0.2.0" @@ -3458,7 +3475,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c115046..e1ab6f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ chrono = { version = "0.4", features = ["serde"] } clap = { version = "4", features = ["derive"] } console = "0.15" ctrlc = "3" -derive_more = { version = "2.0", features = ["display", "from", "deref", "deref_mut", "into", "as_ref"] } +derive_more = { version = "2.1", features = ["display", "from", "deref", "deref_mut", "into", "as_ref"] } directories = "6" generic-array = "0.14" hex = "0.4" diff --git a/crates/lib/src/cryptography/authorization_tag.rs b/crates/lib/src/cryptography/authorization_tag.rs index 5093663..dc20e1a 100644 --- a/crates/lib/src/cryptography/authorization_tag.rs +++ b/crates/lib/src/cryptography/authorization_tag.rs @@ -1,17 +1,22 @@ use std::str::FromStr; use aes_gcm::Tag; -use derive_more::{AsMut, AsRef, From}; +use derive_more::{AsMut, From}; use generic_array::GenericArray; use crate::*; -#[derive(AsRef, AsMut, From)] +#[derive(AsMut, From)] #[as_mut([u8])] -#[as_ref[Tag]] #[impl_tools::autoimpl(Debug, PartialEq)] pub struct AuthorizationTag(GenericArray); +impl AsRef> for AuthorizationTag { + fn as_ref(&self) -> &Tag { + &self.0 + } +} + impl FromStr for AuthorizationTag { type Err = Base64DecodeError;