chore: fix lint warnings emitted by newer clippy

Author: istankovic

jwt/src/dpop/verify.rs

@@ -71,18 +71,18 @@ impl VerifyDpop for &str {
         };
 
         let claims = (*self).verify_jwt::<Dpop>(&pk, max_expiration, verify)?;
-        if let Some(expected_htm) = htm {
-            if expected_htm != claims.custom.htm {
-                return Err(RustyJwtError::DpopHtmMismatch);
-            }
+        if let Some(expected_htm) = htm
+            && expected_htm != claims.custom.htm
+        {
+            return Err(RustyJwtError::DpopHtmMismatch);
         }
         if htu != &claims.custom.htu {
             return Err(RustyJwtError::DpopHtuMismatch);
         }
-        if let Some(chal) = challenge {
-            if chal != &claims.custom.challenge {
-                return Err(RustyJwtError::DpopChallengeMismatch);
-            }
+        if let Some(chal) = challenge
+            && chal != &claims.custom.challenge
+        {
+            return Err(RustyJwtError::DpopChallengeMismatch);
         }
         if &claims.custom.handle != handle {
             return Err(RustyJwtError::DpopHandleMismatch);

x509-check/src/revocation/cache.rs

@@ -32,10 +32,10 @@ impl RevocationStatusCache for RevocationCache {
             return PathValidationStatus::RevocationStatusNotDetermined;
         };
 
-        if let Some(status_and_time) = cache_map.get(&get_name_serial_pair(cert)) {
-            if status_and_time.valid_until > time_of_interest {
-                return status_and_time.status;
-            }
+        if let Some(status_and_time) = cache_map.get(&get_name_serial_pair(cert))
+            && status_and_time.valid_until > time_of_interest
+        {
+            return status_and_time.status;
         }
 
         PathValidationStatus::RevocationStatusNotDetermined

x509-check/src/revocation/crl_info.rs

@@ -124,10 +124,10 @@ impl TryFrom<&CertificateList> for CrlInfo {
                         }
                     } // end ID_CE_ISSUING_DISTRIBUTION_POINT
                     ID_CE_AUTHORITY_KEY_IDENTIFIER => {
-                        if let Ok(akid) = AuthorityKeyIdentifier::from_der(ext.extn_value.as_bytes()) {
-                            if let Some(kid) = akid.key_identifier {
-                                skid = Some(kid.as_bytes().to_vec());
-                            }
+                        if let Ok(akid) = AuthorityKeyIdentifier::from_der(ext.extn_value.as_bytes())
+                            && let Some(kid) = akid.key_identifier
+                        {
+                            skid = Some(kid.as_bytes().to_vec());
                         }
                     }
                     ID_CE_DELTA_CRL_INDICATOR => {

x509-check/src/revocation/crl_store.rs

@@ -140,19 +140,18 @@ impl CrlSource for CrlStore {
         // AKI matching
         if let Ok(Some(PDVExtension::AuthorityKeyIdentifier(akid))) =
             cert.get_extension(&ID_CE_AUTHORITY_KEY_IDENTIFIER)
+            && let Some(kid) = &akid.key_identifier
         {
-            if let Some(kid) = &akid.key_identifier {
-                let skids = self.sk_ids.lock().map_err(|_| certval::Error::Unrecognized)?;
-                let kid_bytes = kid.as_bytes();
-                if let Some(indices) = skids.get(kid_bytes) {
-                    let mut retval = vec![];
-                    for index in indices {
-                        if let Some(crl) = crls.get(*index) {
-                            retval.push(crl.to_der()?);
-                        }
+            let skids = self.sk_ids.lock().map_err(|_| certval::Error::Unrecognized)?;
+            let kid_bytes = kid.as_bytes();
+            if let Some(indices) = skids.get(kid_bytes) {
+                let mut retval = vec![];
+                for index in indices {
+                    if let Some(crl) = crls.get(*index) {
+                        retval.push(crl.to_der()?);
                     }
-                    return Ok(retval);
                 }
+                return Ok(retval);
             }
         }
 

x509-check/src/revocation/misc.rs

@@ -15,10 +15,10 @@ pub(crate) fn check_crl_valid_at_toi(toi: u64, crl: &CertificateList) -> bool {
         return false;
     }
 
-    if let Some(nu) = crl.tbs_cert_list.next_update {
-        if nu.to_unix_duration().as_secs() < toi {
-            return false;
-        }
+    if let Some(nu) = crl.tbs_cert_list.next_update
+        && nu.to_unix_duration().as_secs() < toi
+    {
+        return false;
     }
 
     true
@@ -27,14 +27,13 @@ pub(crate) fn check_crl_valid_at_toi(toi: u64, crl: &CertificateList) -> bool {
 pub(crate) fn get_dp_from_crl(crl: &CertificateList) -> Option<Vec<u8>> {
     if let Some(exts) = &crl.tbs_cert_list.crl_extensions {
         for ext in exts {
-            if ext.extn_id == ID_CE_ISSUING_DISTRIBUTION_POINT {
-                if let Some(enc_dp) = IssuingDistributionPoint::from_der(ext.extn_value.as_bytes())
+            if ext.extn_id == ID_CE_ISSUING_DISTRIBUTION_POINT
+                && let Some(enc_dp) = IssuingDistributionPoint::from_der(ext.extn_value.as_bytes())
                     .ok()
                     .and_then(|idp| idp.distribution_point)
                     .and_then(|dp| dp.to_der().ok())
-                {
-                    return Some(enc_dp);
-                }
+            {
+                return Some(enc_dp);
             }
         }
     }