From a1967a2128485ed61e8e836e42c93a13eafc8c94 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 17 Aug 2021 00:53:26 +0800 Subject: [PATCH] make parblock size parametrizeabel (almost) there's a weird bit where GenericArray needs a U-size (U16) to match the CONST declaration. --- services/root-keys/src/api.rs | 3 ++- services/root-keys/src/implementation.rs | 2 +- services/root-keys/src/lib.rs | 3 ++- services/root-keys/src/main.rs | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/root-keys/src/api.rs b/services/root-keys/src/api.rs index e6a68efa9..b7d274b59 100644 --- a/services/root-keys/src/api.rs +++ b/services/root-keys/src/api.rs @@ -97,6 +97,7 @@ pub enum RootkeyResult { pub use cipher::{BlockCipher, consts::U16}; use zeroize::Zeroize; +pub const PAR_BLOCKS: usize = 16; /// Selects which key to use for the decryption/encryption oracle. /// currently only one type is available, the User key, but dozens more /// could be accommodated. @@ -110,7 +111,7 @@ pub enum AesRootkeyType { #[zeroize(drop)] pub enum AesBlockType { SingleBlock([u8; 16]), - ParBlock([[u8; 16]; 16]), + ParBlock([[u8; 16]; PAR_BLOCKS]), } #[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Zeroize)] #[zeroize(drop)] diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index 7692df14b..136cf3441 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -705,7 +705,7 @@ impl<'a> RootKeys { AesOpType::Encrypt => cipher.encrypt_block(block.try_into().unwrap()) } } - pub fn aes_par_op(&mut self, key_index: u8, op_type: AesOpType, blocks: &mut[[u8; 16]; 16]) { + pub fn aes_par_op(&mut self, key_index: u8, op_type: AesOpType, blocks: &mut[[u8; 16]; PAR_BLOCKS]) { let key = match key_index { KeyRomLocs::USER_KEY => { let mut key_enc = self.read_key_256(KeyRomLocs::USER_KEY); diff --git a/services/root-keys/src/lib.rs b/services/root-keys/src/lib.rs index 444a56e14..6d65eeb12 100644 --- a/services/root-keys/src/lib.rs +++ b/services/root-keys/src/lib.rs @@ -175,6 +175,7 @@ pub type ParBlocks = cipher::generic_array::GenericArray