upgrade aes

Zondax · May 9, 2024 · d494f24 · d494f24
1 parent 44b24fd
commit d494f24
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 96 deletions.
diff --git a/app/rust/Cargo.lock b/app/rust/Cargo.lock
diff --git a/app/rust/Cargo.toml b/app/rust/Cargo.toml
@@ -21,8 +21,8 @@ blake2s_simd = { version = "1", default-features = false }
 group = { version = "0.13", default-features = false }
 chacha20poly1305 = { version = "0.10.1", default-features = false, features = ["heapless"] }
 
-binary-ff1 = { version = "0.1.0", default-features = false }
-aes = { version = "=0.3", default-features = false }
+binary-ff1 = { version = "0.2.0", default-features = false }
+aes = { version = "0.7.5", default-features = false }
 
 byteorder = { version = "1.5", default-features = false }
 hex = { version = "0.4.3", default-features = false }

diff --git a/app/rust/src/bolos/aes.rs b/app/rust/src/bolos/aes.rs
@@ -1,6 +1,8 @@
-use aes::block_cipher_trait::generic_array::typenum::{U16, U32, U8};
-use aes::block_cipher_trait::generic_array::GenericArray;
-use aes::block_cipher_trait::BlockCipher;
+use aes::cipher::generic_array::typenum::{U16, U32, U8};
+use aes::cipher::generic_array::GenericArray;
+use aes::cipher::BlockEncrypt;
+use aes::cipher::NewBlockCipher;
+use aes::cipher::{BlockCipher, BlockCipherKey};
 use aes::Aes256;
 
 extern "C" {
@@ -42,24 +44,25 @@ impl AesBOLOS {
 }
 
 impl BlockCipher for AesBOLOS {
-    type KeySize = U32;
     type BlockSize = U16;
     type ParBlocks = U8;
+}
+
+impl NewBlockCipher for AesBOLOS {
+    type KeySize = U32;
 
     #[inline(never)]
-    fn new(k: &GenericArray<u8, Self::KeySize>) -> AesBOLOS {
-        let v: [u8; 32] = k.as_slice().try_into().expect("Wrong length");
+    fn new(key: &BlockCipherKey<Self>) -> Self {
+        let v: [u8; 32] = key.as_slice().try_into().expect("Wrong length");
         AesBOLOS { key: v }
     }
+}
+impl BlockEncrypt for AesBOLOS {
     #[inline(never)]
     fn encrypt_block(&self, block: &mut GenericArray<u8, Self::BlockSize>) {
         let x: [u8; 16] = block.as_slice().try_into().expect("err");
         let y = aes256_encrypt_block(&self.key, &x);
 
         block.copy_from_slice(&y);
     }
-
-    fn decrypt_block(&self, _block: &mut GenericArray<u8, Self::BlockSize>) {
-        //not used but has to be defined
-    }
 }
diff --git a/app/rust/src/commitments.rs b/app/rust/src/commitments.rs
@@ -274,10 +274,7 @@ mod tests {
     fn test_mixed_pedersen() {
         let v = 312354353u32;
         let scalar = into_fixed_array(v);
-        let mp = mixed_pedersen(
-            &ExtendedPoint::identity(),
-            Fr::from_bytes(&scalar).unwrap(),
-        );
+        let mp = mixed_pedersen(&ExtendedPoint::identity(), Fr::from_bytes(&scalar).unwrap());
         assert_eq!(
             mp,
             [

diff --git a/app/rust/src/utils.rs b/app/rust/src/utils.rs
@@ -70,11 +70,9 @@ mod tests {
         let result = write_u64_tobytes(v);
         let expected = [0xF7, 0xB3, 0xD5, 0x91, 0xE6, 0xA2, 0xC4, 0x80];
         assert_eq!(
-            result,
-            expected,
+            result, expected,
             "Result: {:X?}, Expected: {:X?}",
-            result,
-            expected
+            result, expected
         );
     }
 
@@ -84,11 +82,9 @@ mod tests {
         let result = write_u64_tobytes(v);
         let expected = [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08];
         assert_eq!(
-            result,
-            expected,
+            result, expected,
             "Result: {:X?}, Expected: {:X?}",
-            result,
-            expected
+            result, expected
         );
     }
 
@@ -98,11 +94,9 @@ mod tests {
         let result = write_u64_tobytes(v);
         let expected = [0, 0, 0, 0, 0, 0, 0, 8];
         assert_eq!(
-            result,
-            expected,
+            result, expected,
             "Result: {:X?}, Expected: {:X?}",
-            result,
-            expected
+            result, expected
         );
     }
 
@@ -112,11 +106,9 @@ mod tests {
         let result = write_u64_tobytes(v);
         let expected = [0, 0, 0, 0, 0, 0, 0, 0x0f];
         assert_eq!(
-            result,
-            expected,
+            result, expected,
             "Result: {:X?}, Expected: {:X?}",
-            result,
-            expected
+            result, expected
         );
     }
 
@@ -126,11 +118,9 @@ mod tests {
         let result = write_u64_tobytes(v);
         let expected = [0x50, 0, 0, 0, 0, 0, 0, 0x0F];
         assert_eq!(
-            result,
-            expected,
+            result, expected,
             "Result: {:X?}, Expected: {:X?}",
-            result,
-            expected
+            result, expected
         );
     }