From 68b0bdc29b7b03b22340757b57629ac5be0f668e Mon Sep 17 00:00:00 2001 From: Guillaume Endignoux Date: Thu, 24 Sep 2020 15:08:12 +0200 Subject: [PATCH] Fix more Clippy warnings. --- examples/console_test.rs | 4 ++-- examples/crypto_bench.rs | 2 +- src/ctap/data_formats.rs | 2 +- src/ctap/hid/mod.rs | 1 + src/ctap/hid/receive.rs | 6 ++++++ src/ctap/pin_protocol_v1.rs | 4 ++-- src/ctap/storage.rs | 17 +++++++---------- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/examples/console_test.rs b/examples/console_test.rs index 0bdd307..c6de0cf 100644 --- a/examples/console_test.rs +++ b/examples/console_test.rs @@ -23,8 +23,8 @@ fn main() { let mut buf = [0; BUFFER_SIZE]; loop { for i in 1..buf.len() { - for j in 0..i { - buf[j] = b'0' + ((i % 10) as u8); + for byte in buf.iter_mut().take(i) { + *byte = b'0' + ((i % 10) as u8); } buf[i] = b'\n'; Console::write_unbuffered(&mut buf[..(i + 1)]); diff --git a/examples/crypto_bench.rs b/examples/crypto_bench.rs index 0410140..6106ae2 100644 --- a/examples/crypto_bench.rs +++ b/examples/crypto_bench.rs @@ -151,7 +151,7 @@ fn main() { fn bench(console: &mut Console, timer: &Timer, title: &str, mut f: F) where - F: FnMut() -> (), + F: FnMut(), { writeln!(console, "****************************************").unwrap(); writeln!(console, "Benchmarking: {}", title).unwrap(); diff --git a/src/ctap/data_formats.rs b/src/ctap/data_formats.rs index c5fa8bd..dacafe5 100644 --- a/src/ctap/data_formats.rs +++ b/src/ctap/data_formats.rs @@ -1252,7 +1252,7 @@ mod test { let mut rng = ThreadRng256 {}; let sk = crypto::ecdh::SecKey::gensk(&mut rng); let pk = sk.genpk(); - let cose_key = CoseKey::from(pk.clone()); + let cose_key = CoseKey::from(pk); let cbor_extensions = cbor_map! { "hmac-secret" => cbor_map! { 1 => cbor::Value::Map(cose_key.0.clone()), diff --git a/src/ctap/hid/mod.rs b/src/ctap/hid/mod.rs index 7489f6e..cce4291 100644 --- a/src/ctap/hid/mod.rs +++ b/src/ctap/hid/mod.rs @@ -137,6 +137,7 @@ impl CtapHid { const TIMEOUT_DURATION: Duration = Duration::from_ms(100); const WINK_TIMEOUT_DURATION: Duration = Duration::from_ms(5000); + #[allow(clippy::new_without_default)] pub fn new() -> CtapHid { CtapHid { assembler: MessageAssembler::new(), diff --git a/src/ctap/hid/receive.rs b/src/ctap/hid/receive.rs index fef51a4..5108228 100644 --- a/src/ctap/hid/receive.rs +++ b/src/ctap/hid/receive.rs @@ -49,6 +49,12 @@ pub enum Error { Timeout, } +impl Default for MessageAssembler { + fn default() -> Self { + Self::new() + } +} + impl MessageAssembler { pub fn new() -> MessageAssembler { MessageAssembler { diff --git a/src/ctap/pin_protocol_v1.rs b/src/ctap/pin_protocol_v1.rs index 3db4d43..c03b81b 100644 --- a/src/ctap/pin_protocol_v1.rs +++ b/src/ctap/pin_protocol_v1.rs @@ -777,7 +777,7 @@ mod test { #[test] fn test_process_get_pin_retries() { let mut rng = ThreadRng256 {}; - let mut persistent_store = PersistentStore::new(&mut rng); + let persistent_store = PersistentStore::new(&mut rng); let pin_protocol_v1 = PinProtocolV1::new(&mut rng); let expected_response = Ok(AuthenticatorClientPinResponse { key_agreement: None, @@ -785,7 +785,7 @@ mod test { retries: Some(persistent_store.pin_retries().unwrap() as u64), }); assert_eq!( - pin_protocol_v1.process_get_pin_retries(&mut persistent_store), + pin_protocol_v1.process_get_pin_retries(&persistent_store), expected_response ); } diff --git a/src/ctap/storage.rs b/src/ctap/storage.rs index 00217e7..8db70a2 100644 --- a/src/ctap/storage.rs +++ b/src/ctap/storage.rs @@ -265,12 +265,10 @@ impl PersistentStore { debug_assert_eq!(entry.tag, TAG_CREDENTIAL); let result = deserialize_credential(entry.data); debug_assert!(result.is_some()); - if check_cred_protect - && result.as_ref().map_or(false, |cred| { - cred.cred_protect_policy - == Some(CredentialProtectionPolicy::UserVerificationRequired) - }) - { + let user_verification_required = result.as_ref().map_or(false, |cred| { + cred.cred_protect_policy == Some(CredentialProtectionPolicy::UserVerificationRequired) + }); + if check_cred_protect && user_verification_required { Ok(None) } else { Ok(result) @@ -675,7 +673,6 @@ fn _serialize_min_pin_length_rp_ids(rp_ids: Vec) -> Result, Ctap mod test { use super::*; use crate::ctap::data_formats::{PublicKeyCredentialSource, PublicKeyCredentialType}; - use crypto; use crypto::rng256::{Rng256, ThreadRng256}; fn create_credential_source( @@ -920,7 +917,7 @@ mod test { assert!(persistent_store.store_credential(credential).is_ok()); let no_credential = persistent_store - .find_credential("example.com", &vec![0x00], true) + .find_credential("example.com", &[0x00], true) .unwrap(); assert_eq!(no_credential, None); } @@ -942,8 +939,8 @@ mod test { let master_hmac_key = master_keys_1.hmac.to_vec(); persistent_store.reset(&mut rng).unwrap(); let master_keys_3 = persistent_store.master_keys().unwrap(); - assert!(master_keys_3.encryption != &master_encryption_key[..]); - assert!(master_keys_3.hmac != &master_hmac_key[..]); + assert!(master_keys_3.encryption != master_encryption_key.as_slice()); + assert!(master_keys_3.hmac != master_hmac_key.as_slice()); } #[test]