fixes from cargo lint

mjc-gh · Jan 4, 2024 · 43b1734 · 43b1734
1 parent 350c6d9
commit 43b1734
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/examples/aead_decrypt.rs b/examples/aead_decrypt.rs
@@ -17,11 +17,11 @@ fn main() {
 
     match io::stdin().read_to_string(&mut message) {
         Err(_) => panic!("Read failed"),
-        Ok(_) => match encryptor.decrypt_and_verify(&message.trim()) {
+        Ok(_) => match encryptor.decrypt_and_verify(message.trim()) {
             Ok(ref decrypted_result) => {
                 println!(
                     "Decrypted Message: {}",
-                    str::from_utf8(&decrypted_result).expect("Encryptor failed")
+                    str::from_utf8(decrypted_result).expect("Encryptor failed")
                 );
             }
 

diff --git a/examples/verify_decrypt.rs b/examples/verify_decrypt.rs
@@ -36,16 +36,16 @@ fn main() {
         _ => panic!("Missing input"),
     };
 
-    match verifier.verify(&msg1) {
-        Ok(verified_result) => match encryptor.decrypt_and_verify(&msg2) {
+    match verifier.verify(msg1) {
+        Ok(verified_result) => match encryptor.decrypt_and_verify(msg2) {
             Ok(ref decrypted_result) => {
                 println!(
                     "Verified Message: {}",
                     str::from_utf8(&verified_result).expect("Verifier failed")
                 );
                 println!(
                     "Decrypted Message: {}",
-                    str::from_utf8(&decrypted_result).expect("Encryptor failed")
+                    str::from_utf8(decrypted_result).expect("Encryptor failed")
                 );
             }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -119,7 +119,7 @@ impl Default for DerivedKeyParams {
 /// Create one or more PBKDF2 derived keys using a secret, some key parameters
 /// and one or more salts.
 pub fn create_derived_keys(
-    salts: &Vec<&str>,
+    salts: &[&str],
     secret: &str,
     key_params: DerivedKeyParams,
 ) -> Vec<Vec<u8>> {
@@ -172,7 +172,7 @@ impl Verifier {
 
     /// Verify a signed message generated by a compatible verifier.
     pub fn verify(&self, message: &str) -> Result<Vec<u8>> {
-        let msg_split = split_by_n_dashes(2, &message)?;
+        let msg_split = split_by_n_dashes(2, message)?;
 
         let encoded_data = msg_split[0];
         let signature = msg_split[1];
@@ -277,15 +277,15 @@ impl Encryptor for AesHmacEncryptor {
         let cipher_result = match self.key_size {
             KeySize::Aes128 => {
                 cbc::Encryptor::<aes::Aes128>::new_from_slices(&self.secret_key[0..16], &iv)?
-                    .encrypt_padded_vec_mut::<Pkcs7>(&message)
+                    .encrypt_padded_vec_mut::<Pkcs7>(message)
             }
             KeySize::Aes192 => {
                 cbc::Encryptor::<aes::Aes192>::new_from_slices(&self.secret_key[0..24], &iv)?
-                    .encrypt_padded_vec_mut::<Pkcs7>(&message)
+                    .encrypt_padded_vec_mut::<Pkcs7>(message)
             }
             KeySize::Aes256 => {
                 cbc::Encryptor::<aes::Aes256>::new_from_slices(&self.secret_key[0..32], &iv)?
-                    .encrypt_padded_vec_mut::<Pkcs7>(&message)
+                    .encrypt_padded_vec_mut::<Pkcs7>(message)
             }
         };
 
@@ -318,7 +318,7 @@ impl Encryptor for AesGcmEncryptor {
     /// Decrypt a message, using AEAD, generated by a compatible Encryptor. The message must first
     /// be verified before decryption is attempted.
     fn decrypt_and_verify(&self, message: &str) -> Result<Vec<u8>> {
-        let msg_split = split_by_n_dashes(3, &message)?;
+        let msg_split = split_by_n_dashes(3, message)?;
 
         let mut cipher_text = base64.decode(msg_split[0])?;
         let iv = GenericArray::clone_from_slice(&base64.decode(msg_split[1])?);
@@ -341,7 +341,7 @@ impl Encryptor for AesGcmEncryptor {
                 cipher.decrypt_in_place_detached(&iv, &[], &mut cipher_text, &auth_tag)
             }
         };
-        if let Err(_) = result {
+        if result.is_err() {
             bail!(ErrorKind::InvalidMessage);
         }
         Ok(cipher_text)
@@ -402,7 +402,7 @@ mod tests {
 
         let verifier = Verifier::new("helloworld");
 
-        assert_eq!(verifier.is_valid_message(data, sig).unwrap(), true);
+        assert!(verifier.is_valid_message(data, sig).unwrap());
     }
 
     #[test]
@@ -412,7 +412,7 @@ mod tests {
 
         let verifier = Verifier::new("helloworld");
 
-        assert_eq!(verifier.is_valid_message(data, sig).unwrap(), false);
+        assert!(!verifier.is_valid_message(data, sig).unwrap());
     }
 
     #[test]
@@ -422,7 +422,7 @@ mod tests {
 
         let verifier = Verifier::new("helloworld");
 
-        assert_eq!(verifier.is_valid_message(data, sig).unwrap(), false);
+        assert!(!verifier.is_valid_message(data, sig).unwrap());
     }
 
     #[test]