From 6ddfee29b7ca81cca9afa17815ba0ee7f0bcde75 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jnelson@cloudflare.com>
Date: Thu, 29 Jul 2021 11:58:58 -0400
Subject: [PATCH] Fix clippy warnings for 1.54

---
 boring/examples/mk_certs.rs | 6 +++---
 boring/src/ssl/test/mod.rs  | 2 +-
 boring/src/stack.rs         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/boring/examples/mk_certs.rs b/boring/examples/mk_certs.rs
index bea8d550..217786e2 100644
--- a/boring/examples/mk_certs.rs
+++ b/boring/examples/mk_certs.rs
@@ -65,7 +65,7 @@ fn mk_ca_cert() -> Result<(X509, PKey<Private>), ErrorStack> {
 /// Make a X509 request with the given private key
 fn mk_request(privkey: &PKey<Private>) -> Result<X509Req, ErrorStack> {
     let mut req_builder = X509ReqBuilder::new()?;
-    req_builder.set_pubkey(&privkey)?;
+    req_builder.set_pubkey(privkey)?;
 
     let mut x509_name = X509NameBuilder::new()?;
     x509_name.append_entry_by_text("C", "US")?;
@@ -75,7 +75,7 @@ fn mk_request(privkey: &PKey<Private>) -> Result<X509Req, ErrorStack> {
     let x509_name = x509_name.build();
     req_builder.set_subject_name(&x509_name)?;
 
-    req_builder.sign(&privkey, MessageDigest::sha256())?;
+    req_builder.sign(privkey, MessageDigest::sha256())?;
     let req = req_builder.build();
     Ok(req)
 }
@@ -133,7 +133,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_privkey, MessageDigest::sha256())?;
+    cert_builder.sign(ca_privkey, MessageDigest::sha256())?;
     let cert = cert_builder.build();
 
     Ok((cert, privkey))
diff --git a/boring/src/ssl/test/mod.rs b/boring/src/ssl/test/mod.rs
index 7fddcd0b..87a6c87d 100644
--- a/boring/src/ssl/test/mod.rs
+++ b/boring/src/ssl/test/mod.rs
@@ -1074,7 +1074,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/boring/src/stack.rs b/boring/src/stack.rs
index 043ee178..70f366f6 100644
--- a/boring/src/stack.rs
+++ b/boring/src/stack.rs
@@ -131,7 +131,7 @@ pub struct IntoIter<T: Stackable> {
 impl<T: Stackable> Drop for IntoIter<T> {
     fn drop(&mut self) {
         unsafe {
-            while let Some(_) = self.next() {}
+            for _ in &mut *self {}
             OPENSSL_sk_free(self.stack as *mut _);
         }
     }