Merge pull request #32 from Nitrokey/fmt

Run cargo fmt

Cargo.toml

@@ -55,7 +55,7 @@ entropy = "0.4.0"
 once_cell = "1.13.0"
 serde_test = "1"
 # If this is not enabled, serde_test makes serde_cbor's compilation fail
-serde_cbor = { feature = "0.11.2", features = ["std"] }
+serde_cbor = { version = "0.11.2", features = ["std"] }
 # Somehow, this is causing a regression.
 # rand_core = { version = "0.5", features = ["getrandom"] }
 

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,

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,

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,

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,