From 3cf62cb68704451c9b999a566c327fe235632681 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sun, 10 Apr 2022 22:31:35 +0800
Subject: [PATCH] chore: make clippy happy

---
 src/cmd_pgpcardmake.rs | 2 +-
 src/cmd_piv.rs         | 5 ++---
 src/cmd_pivsign.rs     | 7 ++++---
 src/cmd_rsaverify.rs   | 4 ++--
 src/cmd_u2fsign.rs     | 8 ++++----
 src/fido.rs            | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cmd_pgpcardmake.rs b/src/cmd_pgpcardmake.rs
index c4d82f6..59a77b0 100644
--- a/src/cmd_pgpcardmake.rs
+++ b/src/cmd_pgpcardmake.rs
@@ -243,7 +243,7 @@ fn parse_security_sub_key_to_pgp_rsa_private_key(key: &Key<SecretParts, Subordin
     let private_key = if key.has_unencrypted_secret() {
         key.clone()
     } else {
-        opt_result!(key.clone().decrypt_secret(&password), "Decrypt private key failed: {}")
+        opt_result!(key.clone().decrypt_secret(password), "Decrypt private key failed: {}")
     };
     let (p, q) = if let Key::V4(private_key4) = private_key {
         if let SecretKeyMaterial::Unencrypted(unencrypted) = private_key4.secret() {
diff --git a/src/cmd_piv.rs b/src/cmd_piv.rs
index dc09e2c..c715781 100644
--- a/src/cmd_piv.rs
+++ b/src/cmd_piv.rs
@@ -78,8 +78,7 @@ fn print_cert_info(yubikey: &mut YubiKey, slot: SlotId, detail_output: bool) ->
             return simple_error!("error reading certificate in slot {:?}: {}", slot, e);
         }
     };
-    let buf = cert.as_ref().clone();
-
+    let buf = cert.as_ref();
     if !buf.is_empty() {
         information!("{}", "-".repeat(88));
         let certificate_fingerprint_sha256 = Sha256::digest(buf);
@@ -91,7 +90,7 @@ fn print_cert_info(yubikey: &mut YubiKey, slot: SlotId, detail_output: bool) ->
             information!("{}", bytes_to_pem("CERTIFICATE", buf));
         }
 
-        match parse_x509_certificate(&buf) {
+        match parse_x509_certificate(buf) {
             Ok((_rem, cert)) => {
                 information!("Algorithm: {}", cert.tbs_certificate.subject_pki.algorithm.algorithm);
 
diff --git a/src/cmd_pivsign.rs b/src/cmd_pivsign.rs
index 86def5b..1a5b473 100644
--- a/src/cmd_pivsign.rs
+++ b/src/cmd_pivsign.rs
@@ -75,9 +75,10 @@ fn pkcs1_padding_for_sign(bs: &[u8], bit_len: usize) -> XResult<Vec<u8>> {
     output.push(0x00);
     output.push(0x01);
     let ps_len = byte_len - bs.len() - (1 + 1 + 1);
-    for _ in 0..ps_len {
-        output.push(0xff);
-    }
+    // for _ in 0..ps_len {
+    //     output.push(0xff);
+    // }
+    output.extend_from_slice(&vec![0xff_u8; ps_len]);
     output.push(0x00);
     output.extend_from_slice(bs);
     Ok(output)
diff --git a/src/cmd_rsaverify.rs b/src/cmd_rsaverify.rs
index 77031ff..b317b26 100644
--- a/src/cmd_rsaverify.rs
+++ b/src/cmd_rsaverify.rs
@@ -50,12 +50,12 @@ impl Command for CommandImpl {
         };
 
         rust_util::util_msg::when(MessageType::DEBUG, || {
-            let rsa = keypair.rsa().clone().unwrap();
+            let rsa = keypair.rsa().unwrap();
             let n = rsa.n();
             let e = rsa.e();
             let m = BigNum::from_slice(&signature).unwrap();
             let mut r = BigNum::new().unwrap();
-            r.mod_exp(&m, &e, &n, &mut BigNumContext::new().unwrap()).unwrap();
+            r.mod_exp(&m, e, n, &mut BigNumContext::new().unwrap()).unwrap();
             debugging!("Signature raw HEX: {}", hex::encode(&r.to_vec()));
         });
 
diff --git a/src/cmd_u2fsign.rs b/src/cmd_u2fsign.rs
index 5f17139..caf770a 100644
--- a/src/cmd_u2fsign.rs
+++ b/src/cmd_u2fsign.rs
@@ -126,10 +126,10 @@ impl Command for CommandImpl {
             success!("Parse authorization success, counter: {}", authorization.counter);
 
             // PKey::public_key_from_der()
-            let ec_group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
-            let ec_point = EcPoint::from_bytes(&ec_group, &public_key, &mut BigNumContext::new().unwrap()).unwrap();
-            let ec_key = EcKey::from_public_key(&ec_group, &ec_point).unwrap();
-            let ec_pkey = PKey::from_ec_key(ec_key).unwrap();
+            let ec_group = opt_result!(EcGroup::from_curve_name(Nid::X9_62_PRIME256V1), "New secp256r1 EC group failed: {}");
+            let ec_point = opt_result!(EcPoint::from_bytes(&ec_group, &public_key, &mut BigNumContext::new().unwrap()), "Parse from secp256r1 point failed: {}");
+            let ec_key = opt_result!(EcKey::from_public_key(&ec_group, &ec_point), "Parse secp256r1 public key failed: {}");
+            let ec_pkey = opt_result!(PKey::from_ec_key(ec_key), "EC secp256r1 key to PKey failed: {}");
             let mut verifier = opt_result!(Verifier::new(MessageDigest::sha256(), &ec_pkey), "Verifier new failed: {}");
             verifier.update(&signed_message)?;
             let verify_result = opt_result!(verifier.verify(signature), "Verifier verify failed: {}");
diff --git a/src/fido.rs b/src/fido.rs
index 4d59677..3a0fd49 100644
--- a/src/fido.rs
+++ b/src/fido.rs
@@ -72,7 +72,7 @@ impl U2fRegistrationData {
             "Parse registration data failed: {}");
         Ok(Self {
             app_id: app_id.to_string(),
-            device_info: U2FDeviceInfo::from(&register_result),
+            device_info: U2FDeviceInfo::from(register_result),
             device_name: registration.device_name,
             client_data: client_data.into(),
             registration_data: base64::encode(&register_result.0),