From e24eff6945a51766563bb640cab92a11872c099d Mon Sep 17 00:00:00 2001 From: Georgio Nicolas Date: Sat, 7 Feb 2026 00:25:06 +0100 Subject: [PATCH] clippy stuff --- common/crypto/src/hkdf.rs | 6 +++--- common/nym-kkt/src/carrier.rs | 14 ++++++-------- common/nym-kkt/src/encryption.rs | 10 ++-------- common/nym-kkt/src/rekey.rs | 2 +- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/common/crypto/src/hkdf.rs b/common/crypto/src/hkdf.rs index 28306f51e8..0cd4650083 100644 --- a/common/crypto/src/hkdf.rs +++ b/common/crypto/src/hkdf.rs @@ -124,10 +124,10 @@ pub mod blake3 { input_key_material: &[&[u8]], salt: &[u8], ) -> [u8; 32] { - let mut hasher = Hasher::new_derive_key(&info); + let mut hasher = Hasher::new_derive_key(info); for input_key in input_key_material { - hasher.update(*input_key); + hasher.update(input_key); } hasher.update(salt); @@ -162,7 +162,7 @@ pub mod blake3 { let mut salt = [0u8; 32]; rng().fill_bytes(&mut salt); - let derived_key = derive_key_blake3_multi_input(info, input_key_material, &mut salt); + let derived_key = derive_key_blake3_multi_input(info, input_key_material, &salt); // Zeroize salt salt.zeroize(); diff --git a/common/nym-kkt/src/carrier.rs b/common/nym-kkt/src/carrier.rs index c59a709fac..54bcceeb3c 100644 --- a/common/nym-kkt/src/carrier.rs +++ b/common/nym-kkt/src/carrier.rs @@ -18,7 +18,7 @@ pub struct Carrier { } fn increment_nonce(nonce: &mut u64) -> Result<(), KKTError> { - return match nonce.checked_add(1) { + match nonce.checked_add(1) { Some(incremented_nonce) => { *nonce = incremented_nonce; Ok(()) @@ -26,7 +26,7 @@ fn increment_nonce(nonce: &mut u64) -> Result<(), KKTError> { None => Err(KKTError::AEADError { info: "Nonce maxed out.", }), - }; + } } fn as_nonce_bytes(nonce: u64) -> [u8; 12] { @@ -55,12 +55,12 @@ impl Carrier { let k1 = derive_key_blake3( "nym-kkt-carrier-kdf-initiator", - &session_secret.as_bytes().as_ref(), + session_secret.as_bytes().as_ref(), &salt, ); let k2 = derive_key_blake3( "nym-kkt-carrier-kdf-responder", - &session_secret.as_bytes().as_ref(), + session_secret.as_bytes().as_ref(), &salt, ); @@ -129,7 +129,6 @@ mod tests { carrier::Carrier, ciphersuite::EncapsulationKey, encryption::*, - frame::KKTFrame, key_utils::{ generate_keypair_ed25519, generate_keypair_libcrux, generate_keypair_mceliece, generate_keypair_mlkem, generate_keypair_x25519, hash_encapsulation_key, @@ -138,7 +137,6 @@ mod tests { anonymous_initiator_process, initiator_ingest_response, responder_ingest_message, responder_process, }, - test, }; use nym_kkt_ciphersuite::{Ciphersuite, HashFunction, KEM}; @@ -147,7 +145,7 @@ mod tests { let mut rng = rand09::rng(); // generate ed25519 keys - let initiator_ed25519_keypair = generate_keypair_ed25519(&mut rng, Some(0)); + let _initiator_ed25519_keypair = generate_keypair_ed25519(&mut rng, Some(0)); let responder_ed25519_keypair = generate_keypair_ed25519(&mut rng, Some(1)); // generate responder x25519 keys @@ -197,7 +195,7 @@ mod tests { let r_kem_key_bytes = responder_kem_public_key.encode(); - let i_dir_hash = hash_encapsulation_key( + let _i_dir_hash = hash_encapsulation_key( &ciphersuite.hash_function(), ciphersuite.hash_len(), &i_kem_key_bytes, diff --git a/common/nym-kkt/src/encryption.rs b/common/nym-kkt/src/encryption.rs index d85be50e6d..32b10665ff 100644 --- a/common/nym-kkt/src/encryption.rs +++ b/common/nym-kkt/src/encryption.rs @@ -1,16 +1,10 @@ // Copyright 2025-2026 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use crate::{ - KKT_INITIAL_FRAME_AAD, ciphersuite::EncapsulationKey, context::KKTContext, error::KKTError, - frame::KKTFrame, -}; +use crate::{KKT_INITIAL_FRAME_AAD, context::KKTContext, error::KKTError, frame::KKTFrame}; use libcrux_chacha20poly1305::{NONCE_LEN, TAG_LEN}; -use libcrux_psq::{ - handshake::types::{DHKeyPair, DHPrivateKey, DHPublicKey, PQEncapsulationKey}, - session::{Session, SessionBinding}, -}; +use libcrux_psq::handshake::types::{DHKeyPair, DHPrivateKey, DHPublicKey}; use nym_crypto::hkdf::blake3::derive_key_blake3; use nym_kkt_ciphersuite::x25519; use rand09::{CryptoRng, RngCore}; diff --git a/common/nym-kkt/src/rekey.rs b/common/nym-kkt/src/rekey.rs index 4819a6a7c4..d41f7e2a5b 100644 --- a/common/nym-kkt/src/rekey.rs +++ b/common/nym-kkt/src/rekey.rs @@ -200,7 +200,7 @@ where // Encode the `pre_key` into bytes let pre_key_bytes = pre_key.encode(); - let new_secret: [u8; 32] = derive_key_blake3(REKEY_CONTEXT, &pre_key_bytes, &remote_salt); + let new_secret: [u8; 32] = derive_key_blake3(REKEY_CONTEXT, &pre_key_bytes, remote_salt); // Zeroize the Initiator's salt remote_salt.zeroize();