From 9fe642ba7a8f3c82d17f34df123053c2db5312f2 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Thu, 14 Nov 2024 00:00:12 +0800 Subject: [PATCH] feat: update dependencies --- Cargo.lock | 34 +++++++++++++++++----------------- src/jose.rs | 14 +++++++------- src/main.rs | 7 +++++-- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f8847e0..1dd0d0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,9 +190,9 @@ checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cc" -version = "1.1.37" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf" +checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8" dependencies = [ "shlex", ] @@ -249,9 +249,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -1068,9 +1068,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1163,9 +1163,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" dependencies = [ "bitflags 2.6.0", "errno 0.3.9", @@ -1212,25 +1212,25 @@ dependencies = [ "anyhow", "cfg-if", "libc", - "rustix 0.38.39", + "rustix 0.38.40", "thiserror", "windows", ] [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote 1.0.37", @@ -1390,18 +1390,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote 1.0.37", diff --git a/src/jose.rs b/src/jose.rs index 46cfa21..eaf0021 100644 --- a/src/jose.rs +++ b/src/jose.rs @@ -6,7 +6,7 @@ use josekit::jwk::alg::rsa::RsaKeyPair; use josekit::jwk::Jwk; use rust_util::XResult; use serde_json::Value; -use sha2::Digest; +use sha2::{Digest, Sha256}; const LOCAL_KMS_PREFIX: &str = "LKMS:"; @@ -42,12 +42,12 @@ pub fn deserialize_jwe_aes(jwe: &str, key: &[u8]) -> XResult<(Vec, JweHeader } fn get_master_key_checksum(key: &[u8]) -> String { - let digest = sha2::Sha256::digest(key); - let digest = sha2::Sha256::digest(digest.as_slice()); - let digest = sha2::Sha256::digest(digest.as_slice()); - let digest = sha2::Sha256::digest(digest.as_slice()); - let digest = sha2::Sha256::digest(digest.as_slice()); - let digest = sha2::Sha256::digest(digest.as_slice()); + let digest = Sha256::digest(key); + let digest = Sha256::digest(digest.as_slice()); + let digest = Sha256::digest(digest.as_slice()); + let digest = Sha256::digest(digest.as_slice()); + let digest = Sha256::digest(digest.as_slice()); + let digest = Sha256::digest(digest.as_slice()); hex::encode(&digest[0..8]) } diff --git a/src/main.rs b/src/main.rs index 682f0f2..03744d6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -54,8 +54,11 @@ fn inner_main() -> CommandError { Box::new(yubikey_init_master_key::CommandImpl), ]; let mut features: Vec = vec![]; - #[cfg(feature = "yubikey")] - features.push("yubikey".to_string()); + #[allow(clippy::vec_init_then_push)] + { + #[cfg(feature = "yubikey")] + features.push("yubikey".to_string()); + } let long_about = format!("Local mini KMS, features: [{}]", features.join(", ")); let mut app = App::new(env!("CARGO_PKG_NAME")) .version(env!("CARGO_PKG_VERSION"))