Fixes clippy warnings from nightly (#747)

* Fixes clippy warnings from nightly

* Bumps the Rust version to what we actually use

Author: kaczmarczyck

libraries/cbor/src/reader.rs

@@ -71,7 +71,7 @@ impl<'a> Reader<'a> {
         &mut self,
         remaining_depth: Option<i8>,
     ) -> Result<Value, DecoderError> {
-        if remaining_depth.map_or(false, |d| d < 0) {
+        if remaining_depth.is_some_and(|d| d < 0) {
             return Err(DecoderError::TooMuchNesting);
         }
 

libraries/cbor/src/writer.rs

@@ -57,7 +57,7 @@ impl<'a> Writer<'a> {
         value: Value,
         remaining_depth: Option<i8>,
     ) -> Result<(), EncoderError> {
-        if remaining_depth.map_or(false, |d| d < 0) {
+        if remaining_depth.is_some_and(|d| d < 0) {
             return Err(EncoderError::TooMuchNesting);
         }
         let type_label = value.0.type_label();

libraries/opensk/Cargo.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 license = "Apache-2.0"
 edition = "2018"
-rust-version = "1.66"
+rust-version = "1.80"
 
 [dependencies]
 sk-cbor = { path = "../cbor" }

libraries/opensk/src/api/crypto/rust_crypto.rs

@@ -44,7 +44,7 @@ use std::sync::{Mutex, MutexGuard};
 static BUSY: Mutex<()> = Mutex::new(());
 #[cfg(test)]
 thread_local! {
-    static BUSY_GUARD: RefCell<Option<MutexGuard<'static, ()>>> = RefCell::new(None);
+    static BUSY_GUARD: RefCell<Option<MutexGuard<'static, ()>>> = const { RefCell::new(None) };
 }
 
 pub struct SoftwareCrypto;

libraries/opensk/src/api/fingerprint.rs

@@ -57,10 +57,14 @@ pub trait Fingerprint {
     ///
     /// This function returns:
     /// - The `Ctap2EnrollFeedback` contains expected errors from the
-    /// fingerprint capture process.
+    ///   fingerprint capture process.
     /// - The expected number of remaining samples.
-    /// If the sensor finished template creation, return a hardware ID for this
-    /// template. This ID is different from the FIDO template ID, but they are
+    /// - Eventually, a hardware ID for this template.
+    ///
+    /// The template ID must be returned until remaining samples is 0.
+    /// When or how often it is returned is up to the implementation, but it
+    /// needs to be consistent if returned more than once.
+    /// This ID is different from the FIDO template ID, but they are
     /// mapped to each other in OpenSK. This should happen exactly when the
     /// returned number of `remainingSamples` is 0.
     ///

libraries/opensk/src/ctap/client_pin.rs

@@ -567,6 +567,7 @@ impl<E: Env> ClientPin<E> {
     /// - verified with the shared secret and salt_auth,
     /// - decrypted with the shared secret,
     /// - HMAC'ed with cred_random.
+    ///
     /// The length of the output matches salt_enc and has to be 1 or 2 blocks of
     /// 32 byte.
     pub fn process_hmac_secret(

libraries/opensk/src/ctap/ctap1.rs

@@ -78,11 +78,7 @@ impl TryFrom<&[u8]> for U2fCommand {
     type Error = Ctap1StatusCode;
 
     fn try_from(message: &[u8]) -> Result<Self, Ctap1StatusCode> {
-        let apdu: Apdu = match Apdu::try_from(message) {
-            Ok(apdu) => apdu,
-            Err(apdu_status_code) => return Err(apdu_status_code),
-        };
-
+        let apdu = Apdu::try_from(message)?;
         let lc = apdu.lc as usize;
 
         // ISO7816 APDU Header format. Each cell is 1 byte. Note that the CTAP flavor always

libraries/opensk/src/ctap/data_formats.rs

@@ -1260,18 +1260,12 @@ mod test {
 
     #[test]
     fn test_extract_unsigned_limits() {
+        assert_eq!(extract_unsigned(cbor_unsigned!(u64::MAX)), Ok(u64::MAX));
         assert_eq!(
-            extract_unsigned(cbor_unsigned!(std::u64::MAX)),
-            Ok(std::u64::MAX)
-        );
-        assert_eq!(
-            extract_unsigned(cbor_unsigned!((std::i64::MAX as u64) + 1)),
-            Ok((std::i64::MAX as u64) + 1)
-        );
-        assert_eq!(
-            extract_unsigned(cbor_int!(std::i64::MAX)),
-            Ok(std::i64::MAX as u64)
+            extract_unsigned(cbor_unsigned!((i64::MAX as u64) + 1)),
+            Ok((i64::MAX as u64) + 1)
         );
+        assert_eq!(extract_unsigned(cbor_int!(i64::MAX)), Ok(i64::MAX as u64));
         assert_eq!(extract_unsigned(cbor_int!(123)), Ok(123));
         assert_eq!(extract_unsigned(cbor_int!(1)), Ok(1));
         assert_eq!(extract_unsigned(cbor_int!(0)), Ok(0));
@@ -1284,7 +1278,7 @@ mod test {
             Err(CTAP2_ERR_CBOR_UNEXPECTED_TYPE)
         );
         assert_eq!(
-            extract_unsigned(cbor_int!(std::i64::MIN)),
+            extract_unsigned(cbor_int!(i64::MIN)),
             Err(CTAP2_ERR_CBOR_UNEXPECTED_TYPE)
         );
     }
@@ -1318,20 +1312,20 @@ mod test {
     #[test]
     fn test_extract_integer_limits() {
         assert_eq!(
-            extract_integer(cbor_unsigned!(std::u64::MAX)),
+            extract_integer(cbor_unsigned!(u64::MAX)),
             Err(CTAP2_ERR_CBOR_UNEXPECTED_TYPE)
         );
         assert_eq!(
-            extract_integer(cbor_unsigned!((std::i64::MAX as u64) + 1)),
+            extract_integer(cbor_unsigned!((i64::MAX as u64) + 1)),
             Err(CTAP2_ERR_CBOR_UNEXPECTED_TYPE)
         );
-        assert_eq!(extract_integer(cbor_int!(std::i64::MAX)), Ok(std::i64::MAX));
+        assert_eq!(extract_integer(cbor_int!(i64::MAX)), Ok(i64::MAX));
         assert_eq!(extract_integer(cbor_int!(123)), Ok(123));
         assert_eq!(extract_integer(cbor_int!(1)), Ok(1));
         assert_eq!(extract_integer(cbor_int!(0)), Ok(0));
         assert_eq!(extract_integer(cbor_int!(-1)), Ok(-1));
         assert_eq!(extract_integer(cbor_int!(-123)), Ok(-123));
-        assert_eq!(extract_integer(cbor_int!(std::i64::MIN)), Ok(std::i64::MIN));
+        assert_eq!(extract_integer(cbor_int!(i64::MIN)), Ok(i64::MIN));
     }
 
     #[test]

libraries/opensk/src/ctap/large_blobs.rs

@@ -478,7 +478,7 @@ mod test {
 
         let large_blobs_params = AuthenticatorLargeBlobsParameters {
             get: None,
-            set: Some(large_blob.to_vec()),
+            set: Some(large_blob),
             offset: 0,
             length: Some(BLOB_LEN),
             pin_uv_auth_param: None,

libraries/opensk/src/ctap/mod.rs

@@ -3490,7 +3490,7 @@ mod test {
         // This TestEnv always returns successful user_presence checks.
         let mut env = TestEnv::default();
         let response = check_user_presence(&mut env, DUMMY_CHANNEL);
-        assert!(matches!(response, Ok(_)));
+        assert!(response.is_ok());
     }
 
     #[test]