Fix clippy warnings

trussed-dev · Feb 21, 2024 · 7f4e12d · 7f4e12d
1 parent 1012a9b
commit 7f4e12d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/src/mechanisms/hmacblake2s.rs b/src/mechanisms/hmacblake2s.rs
@@ -26,11 +26,7 @@ impl DeriveKey for super::HmacBlake2s {
         if let Some(additional_data) = &request.additional_data {
             mac.update(additional_data);
         }
-        let derived_key: [u8; 32] = mac
-            .finalize()
-            .into_bytes()
-            .try_into()
-            .map_err(|_| Error::InternalError)?;
+        let derived_key: [u8; 32] = mac.finalize().into_bytes().into();
         let key = keystore.store_key(
             request.attributes.persistence,
             key::Secrecy::Secret,

diff --git a/src/mechanisms/hmacsha1.rs b/src/mechanisms/hmacsha1.rs
@@ -26,11 +26,7 @@ impl DeriveKey for super::HmacSha1 {
         if let Some(additional_data) = &request.additional_data {
             mac.update(additional_data);
         }
-        let derived_key: [u8; 20] = mac
-            .finalize()
-            .into_bytes()
-            .try_into()
-            .map_err(|_| Error::InternalError)?;
+        let derived_key: [u8; 20] = mac.finalize().into_bytes().into();
         let key_id = keystore.store_key(
             request.attributes.persistence,
             key::Secrecy::Secret,

diff --git a/src/mechanisms/hmacsha256.rs b/src/mechanisms/hmacsha256.rs
@@ -31,11 +31,7 @@ impl DeriveKey for super::HmacSha256 {
         if let Some(additional_data) = &request.additional_data {
             mac.update(additional_data);
         }
-        let derived_key: [u8; 32] = mac
-            .finalize()
-            .into_bytes()
-            .try_into()
-            .map_err(|_| Error::InternalError)?;
+        let derived_key: [u8; 32] = mac.finalize().into_bytes().into();
         let key_id = keystore.store_key(
             request.attributes.persistence,
             key::Secrecy::Secret,

diff --git a/src/mechanisms/hmacsha512.rs b/src/mechanisms/hmacsha512.rs
@@ -25,8 +25,8 @@ impl DeriveKey for super::HmacSha512 {
         if let Some(additional_data) = &request.additional_data {
             mac.update(additional_data);
         }
-        let mut derived_key = [0u8; 64];
-        derived_key.copy_from_slice(&mac.finalize().into_bytes()); //.try_into().map_err(|_| Error::InternalError)?;
+        let derived_key: [u8; 64] = mac.finalize().into_bytes().into();
+
         let key = keystore.store_key(
             request.attributes.persistence,
             key::Secrecy::Secret,

diff --git a/src/service.rs b/src/service.rs
@@ -148,6 +148,7 @@ impl<P: Platform> ServiceResources<P> {
             generator
         }
 
+        #[cfg(feature = "crypto-client-attest")]
         let full_store = self.platform.store();
 
         let keystore = once(|this, ctx| this.keystore(ctx.path.clone()));

diff --git a/tests/store/mod.rs b/tests/store/mod.rs
@@ -1,4 +1,3 @@
-pub use generic_array::typenum::consts;
 use littlefs2::const_ram_storage;
 use trussed::types::{LfsResult, LfsStorage};