From aa8d31ec88f86919e08e99dbd175b40f1c647718 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 29 Jul 2021 19:16:36 -0400 Subject: [PATCH] fix clippy --- openssl-sys/build/find_normal.rs | 2 +- openssl-sys/build/main.rs | 2 +- openssl/examples/mk_certs.rs | 6 +++--- openssl/src/cms.rs | 2 +- openssl/src/encrypt.rs | 8 ++++---- openssl/src/envelope.rs | 2 +- openssl/src/ssl/test/mod.rs | 6 +++--- openssl/src/stack.rs | 2 ++ 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/openssl-sys/build/find_normal.rs b/openssl-sys/build/find_normal.rs index 16fa8bc46..786b31ae5 100644 --- a/openssl-sys/build/find_normal.rs +++ b/openssl-sys/build/find_normal.rs @@ -12,7 +12,7 @@ pub fn get_openssl(target: &str) -> (PathBuf, PathBuf) { match (lib_dir, include_dir) { (Some(lib_dir), Some(include_dir)) => (lib_dir, include_dir), (lib_dir, include_dir) => { - let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(&target)); + let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(target)); let openssl_dir = Path::new(&openssl_dir); let lib_dir = lib_dir.unwrap_or_else(|| openssl_dir.join("lib")); let include_dir = include_dir.unwrap_or_else(|| openssl_dir.join("include")); diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs index 88752d995..ad19b4a9c 100644 --- a/openssl-sys/build/main.rs +++ b/openssl-sys/build/main.rs @@ -85,7 +85,7 @@ fn main() { let libs_env = env("OPENSSL_LIBS"); let libs = match libs_env.as_ref().and_then(|s| s.to_str()) { - Some(ref v) => { + Some(v) => { if v.is_empty() { vec![] } else { diff --git a/openssl/examples/mk_certs.rs b/openssl/examples/mk_certs.rs index c0aa0b6c0..e944af06b 100644 --- a/openssl/examples/mk_certs.rs +++ b/openssl/examples/mk_certs.rs @@ -63,7 +63,7 @@ fn mk_ca_cert() -> Result<(X509, PKey), ErrorStack> { /// Make a X509 request with the given private key fn mk_request(key_pair: &PKey) -> Result { let mut req_builder = X509ReqBuilder::new()?; - req_builder.set_pubkey(&key_pair)?; + req_builder.set_pubkey(key_pair)?; let mut x509_name = X509NameBuilder::new()?; x509_name.append_entry_by_text("C", "US")?; @@ -73,7 +73,7 @@ fn mk_request(key_pair: &PKey) -> Result { let x509_name = x509_name.build(); req_builder.set_subject_name(&x509_name)?; - req_builder.sign(&key_pair, MessageDigest::sha256())?; + req_builder.sign(key_pair, MessageDigest::sha256())?; let req = req_builder.build(); Ok(req) } @@ -131,7 +131,7 @@ fn mk_ca_signed_cert( .build(&cert_builder.x509v3_context(Some(ca_cert), None))?; cert_builder.append_extension(subject_alt_name)?; - cert_builder.sign(&ca_key_pair, MessageDigest::sha256())?; + cert_builder.sign(ca_key_pair, MessageDigest::sha256())?; let cert = cert_builder.build(); Ok((cert, key_pair)) diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs index 5ef23eeac..48621ee57 100644 --- a/openssl/src/cms.rs +++ b/openssl/src/cms.rs @@ -280,7 +280,7 @@ mod test { let encrypt = CmsContentInfo::encrypt( &cert_stack, - &input.as_bytes(), + input.as_bytes(), Cipher::des_ede3_cbc(), CMSOptions::empty(), ) diff --git a/openssl/src/encrypt.rs b/openssl/src/encrypt.rs index a1973f60c..4f8914c81 100644 --- a/openssl/src/encrypt.rs +++ b/openssl/src/encrypt.rs @@ -489,9 +489,9 @@ mod test { let mut decrypter = Decrypter::new(&pkey).unwrap(); decrypter.set_rsa_padding(Padding::PKCS1).unwrap(); - let buffer_len = decrypter.decrypt_len(&encoded).unwrap(); + let buffer_len = decrypter.decrypt_len(encoded).unwrap(); let mut decoded = vec![0u8; buffer_len]; - let decoded_len = decrypter.decrypt(&encoded, &mut decoded).unwrap(); + let decoded_len = decrypter.decrypt(encoded, &mut decoded).unwrap(); let decoded = &decoded[..decoded_len]; assert_eq!(decoded, &*input); @@ -520,9 +520,9 @@ mod test { decrypter.set_rsa_padding(Padding::PKCS1_OAEP).unwrap(); decrypter.set_rsa_oaep_md(md).unwrap(); decrypter.set_rsa_mgf1_md(md).unwrap(); - let buffer_len = decrypter.decrypt_len(&encoded).unwrap(); + let buffer_len = decrypter.decrypt_len(encoded).unwrap(); let mut decoded = vec![0u8; buffer_len]; - let decoded_len = decrypter.decrypt(&encoded, &mut decoded).unwrap(); + let decoded_len = decrypter.decrypt(encoded, &mut decoded).unwrap(); let decoded = &decoded[..decoded_len]; assert_eq!(decoded, &*input); diff --git a/openssl/src/envelope.rs b/openssl/src/envelope.rs index 963bab34d..31f4258a4 100644 --- a/openssl/src/envelope.rs +++ b/openssl/src/envelope.rs @@ -272,7 +272,7 @@ mod test { let iv = seal.iv(); let encrypted_key = &seal.encrypted_keys()[0]; - let mut open = Open::new(cipher, &private_key, iv, &encrypted_key).unwrap(); + let mut open = Open::new(cipher, &private_key, iv, encrypted_key).unwrap(); let mut decrypted = vec![0; enc_len + cipher.block_size()]; let mut dec_len = open.update(&encrypted[..enc_len], &mut decrypted).unwrap(); dec_len += open.finalize(&mut decrypted[dec_len..]).unwrap(); diff --git a/openssl/src/ssl/test/mod.rs b/openssl/src/ssl/test/mod.rs index 36db2b70e..55651de0c 100644 --- a/openssl/src/ssl/test/mod.rs +++ b/openssl/src/ssl/test/mod.rs @@ -1236,13 +1236,13 @@ fn stateless() { impl<'a> ::std::ops::Deref for Outgoing<'a> { type Target = [u8]; fn deref(&self) -> &[u8] { - &self.0 + self.0 } } impl<'a> AsRef<[u8]> for Outgoing<'a> { fn as_ref(&self) -> &[u8] { - &self.0 + self.0 } } @@ -1326,7 +1326,7 @@ fn psk_ciphers() { client .ctx() .set_psk_client_callback(move |_, _, identity, psk| { - identity[..CLIENT_IDENT.len()].copy_from_slice(&CLIENT_IDENT); + identity[..CLIENT_IDENT.len()].copy_from_slice(CLIENT_IDENT); identity[CLIENT_IDENT.len()] = 0; psk[..PSK.len()].copy_from_slice(PSK); CLIENT_CALLED.store(true, Ordering::SeqCst); diff --git a/openssl/src/stack.rs b/openssl/src/stack.rs index 25d06eea5..2c21b57bf 100644 --- a/openssl/src/stack.rs +++ b/openssl/src/stack.rs @@ -141,6 +141,8 @@ pub struct IntoIter { impl Drop for IntoIter { fn drop(&mut self) { unsafe { + // https://github.com/rust-lang/rust-clippy/issues/7510 + #[allow(clippy::while_let_on_iterator)] while let Some(_) = self.next() {} OPENSSL_sk_free(self.stack as *mut _); } -- GitLab