fixed problems after unsafe

Author: theonlytruealex

boards/nucleo_u545re_q/src/main.rs

@@ -264,7 +264,7 @@ unsafe fn start() -> (
         AES256
     ));
 
-    aes.set_client(aes_driver);
+    AES::set_client(aes, aes_driver);
 
     // Platform and Interrupts
     let platform = static_init!(

capsules/extra/src/test/aes256.rs

@@ -291,7 +291,6 @@ impl<'a, A: AES<'a, AES256> + AESCtr> TestAES256Ctr<'a, A> {
         let step = self.step.get();
         let encrypting = is_encrypting(step);
         let in_place = is_in_place(step);
-        debug!("aes_test CTR step: {:?}", step);
 
         if !is_second_chunk(step) {
             self.aes.enable();

chips/stm32u5xx-unsafe/src/aes.rs

@@ -14,10 +14,6 @@ use kernel::utilities::registers::{
 use kernel::utilities::StaticRef;
 
 pub const AES_BASE: StaticRef<AesRegisters> =
-    /// ### Safety
-    ///
-    /// The address 0x520C0000 is the dedicated memory-mapped region for the AES
-    /// peripheral on the STM32U5 series, as specified in the reference manual.
     unsafe { StaticRef::new(0x520C0000 as *const AesRegisters) };
 
 register_structs! {
@@ -239,7 +235,26 @@ impl DMABuffers {
         let ptr = dma_slice.as_mut_ptr() as u32;
         (dma_slice, ptr)
     }
-}
-r)
+
+    /// Helper function designed to calculate the length of the buffer as a multiple of AES_BLOCK_SIZE
+    /// and return the remaining bytes inside a 0-padded buffer. If the length of the buffer, beginning
+    /// from start is a multiple of AES_BLOCK_SIZE, will return total_len and None
+    pub fn extract_dma_padding(
+        buf: &[u8],
+        start: usize,
+        total_len: usize,
+    ) -> (usize, Option<[u8; AES_BLOCK_SIZE]>) {
+        // check whether the buffer needs 0-padding
+        if total_len > 0 && !total_len.is_multiple_of(AES_BLOCK_SIZE) {
+            // length multiple of AES_BLOCK_SIZE
+            let len = total_len - (total_len % AES_BLOCK_SIZE);
+            // remainder of the buffer, padded with 0s
+            let mut pad = [0u8; AES_BLOCK_SIZE];
+            let rem = total_len - len;
+            pad[..rem].copy_from_slice(&buf[start + len..start + total_len]);
+            (len, Some(pad))
+        } else {
+            (total_len, None)
+        }
     }
 }

chips/stm32u5xx/src/aes/mod.rs

@@ -85,30 +85,6 @@ pub struct Aes<'a, K: AESKeySize> {
     pub(crate) _phantom: PhantomData<K>,
 }
 
-impl DMABuffers {
-    /// Helper function designed to calculate the length of the buffer as a multiple of AES_BLOCK_SIZE
-    /// and return the remaining bytes inside a 0-padded buffer. If the length of the buffer, beginning
-    /// from start is a multiple of AES_BLOCK_SIZE, will return total_len and None
-    pub fn extract_dma_padding(
-        buf: &[u8],
-        start: usize,
-        total_len: usize,
-    ) -> (usize, Option<[u8; AES_BLOCK_SIZE]>) {
-        // check whether the buffer needs 0-padding
-        if total_len > 0 && !total_len.is_multiple_of(AES_BLOCK_SIZE) {
-            // length multiple of AES_BLOCK_SIZE
-            let len = total_len - (total_len % AES_BLOCK_SIZE);
-            // remainder of the buffer, padded with 0s
-            let mut pad = [0u8; AES_BLOCK_SIZE];
-            let rem = total_len - len;
-            pad[..rem].copy_from_slice(&buf[start + len..start + total_len]);
-            (len, Some(pad))
-        } else {
-            (total_len, None)
-        }
-    }
-}
-
 impl<'a, K: AESKeySize> Aes<'a, K> {
     // default mode: ECB , encrypting
     pub const fn new(base: AesRegistersManager) -> Aes<'a, K> {