Merged main to keep branch up-to-date.

Signed-off-by: Mike Smoot <[email protected]>

psa-crypto-sys/Cargo.toml

@@ -12,7 +12,7 @@ repository = "https://github.com/parallaxsecond/rust-psa-crypto"
 rust-version = "1.66.0"
 
 [build-dependencies]
-bindgen = { version = "0.66.1", optional = true }
+bindgen = { version = "0.69.4", optional = true }
 cc = "1.0.59"
 cmake = "0.1.44"
 regex = "1.9.1"

psa-crypto-sys/src/lib.rs

@@ -23,6 +23,7 @@
 #[allow(clippy::all)]
 #[cfg(feature = "interface")]
 mod psa_crypto_binding {
+    #![allow(unused_imports)]
     include!(concat!(env!("OUT_DIR"), "/shim_bindings.rs"));
 }
 

psa-crypto/src/operations/cipher.rs

@@ -32,7 +32,8 @@ fn crypt(
 
     let mut output_length = 0;
     let mut output_length_finish = 0;
-    let mut inner_crypt = || {
+
+    let status = {
         Status::from(unsafe {
             psa_crypto_sys::psa_cipher_set_iv(&mut operation, iv.as_ptr(), iv.len())
         })
@@ -62,16 +63,15 @@ fn crypt(
 
         Ok(())
     };
-    match inner_crypt() {
-        Ok(()) => (),
+
+    match status {
+        Ok(()) => Ok(output_length + output_length_finish),
         Err(x) => {
             Status::from(unsafe { psa_crypto_sys::psa_cipher_abort(&mut operation) })
                 .to_result()?;
-            return Err(x);
+            Err(x)
         }
     }
-
-    Ok(output_length + output_length_finish)
 }
 
 /// Encrypt a short message with a key

psa-crypto/src/types/key_derivation.rs

@@ -8,7 +8,7 @@ use super::key::Id;
 #[cfg(feature = "operations")]
 use super::status::{Error, Result, Status};
 #[cfg(feature = "operations")]
-use core::convert::{From, TryFrom};
+use core::convert::TryFrom;
 
 /// Key derivation operation for deriving keys from existing sources
 #[derive(Debug, Clone, Copy)]