diff --git a/services/aes-test/src/aes.rs b/services/aes-test/src/aes.rs index 3603fbdc9..e4e516740 100644 --- a/services/aes-test/src/aes.rs +++ b/services/aes-test/src/aes.rs @@ -409,14 +409,14 @@ fn set_encrypt_key_inner( rk[3] = get_u32_be(user_key, 12); let mut rk_offset = 0; if user_key.len() == 16 { - for i in 0..10 { + for rcon in &RCON { let temp = rk[3 + rk_offset] as usize; rk[4 + rk_offset] = rk[0 + rk_offset] ^ (TE2[(temp >> 16) & 0xff] & 0xff000000) ^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (TE0[(temp) & 0xff] & 0x0000ff00) ^ (TE1[(temp >> 24)] & 0x000000ff) - ^ RCON[i]; + ^ rcon; rk[5 + rk_offset] = rk[1 + rk_offset] ^ rk[4 + rk_offset]; rk[6 + rk_offset] = rk[2 + rk_offset] ^ rk[5 + rk_offset]; rk[7 + rk_offset] = rk[3 + rk_offset] ^ rk[6 + rk_offset]; @@ -429,24 +429,27 @@ fn set_encrypt_key_inner( } return Ok(()); } + rk[4] = get_u32_be(user_key, 16); rk[5] = get_u32_be(user_key, 20); if user_key.len() == 24 { - let mut rk_offset = 0; - for i in 0.. { + for rcon in &RCON { let temp = rk[5 + rk_offset] as usize; rk[6 + rk_offset] = rk[0 + rk_offset] ^ (TE2[(temp >> 16) & 0xff] & 0xff000000) ^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (TE0[(temp) & 0xff] & 0x0000ff00) ^ (TE1[(temp >> 24)] & 0x000000ff) - ^ RCON[i]; + ^ rcon; rk[7 + rk_offset] = rk[1 + rk_offset] ^ rk[6 + rk_offset]; rk[8 + rk_offset] = rk[2 + rk_offset] ^ rk[7 + rk_offset]; rk[9 + rk_offset] = rk[3 + rk_offset] ^ rk[8 + rk_offset]; - if i == 7 { + + // Stop midway through the 6th run + if *rcon == RCON[7] { break; } + rk[10 + rk_offset] = rk[4 + rk_offset] ^ rk[9 + rk_offset]; rk[11 + rk_offset] = rk[5 + rk_offset] ^ rk[10 + rk_offset]; rk_offset += 6; @@ -458,25 +461,28 @@ fn set_encrypt_key_inner( } return Ok(()); } + rk[6] = get_u32_be(user_key, 24); rk[7] = get_u32_be(user_key, 28); if user_key.len() == 32 { let mut rk_offset = 0; - for i in 0.. { + for rcon in &RCON { let temp = rk[7 + rk_offset] as usize; rk[8 + rk_offset] = rk[0 + rk_offset] ^ (TE2[(temp >> 16) & 0xff] & 0xff000000) ^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (TE0[(temp) & 0xff] & 0x0000ff00) ^ (TE1[(temp >> 24)] & 0x000000ff) - ^ RCON[i]; + ^ rcon; rk[9 + rk_offset] = rk[1 + rk_offset] ^ rk[8 + rk_offset]; rk[10 + rk_offset] = rk[2 + rk_offset] ^ rk[9 + rk_offset]; rk[11 + rk_offset] = rk[3 + rk_offset] ^ rk[10 + rk_offset]; - if i == 6 { + // Stop midway through the 6th run + if *rcon == RCON[6] { break; } + let temp = rk[11 + rk_offset] as usize; rk[12 + rk_offset] = rk[4 + rk_offset] ^ (TE2[(temp >> 24)] & 0xff000000) diff --git a/services/aes-test/src/main.rs b/services/aes-test/src/main.rs index c5b70ba2d..cc363bdd4 100644 --- a/services/aes-test/src/main.rs +++ b/services/aes-test/src/main.rs @@ -51,8 +51,8 @@ impl<'a, 'b, 'c> AesTest<'a, 'b, 'c> { aes::set_decrypt_key(&self.key, &mut aes_key).unwrap(); log::info!("Running decryption"); aes::vexriscv_aes_decrypt(&self.ciphertext, &mut output, &aes_key); - log::info!("Plaintext: {:?}", self.plaintext); - log::info!("Result: {:?}", output); + log::info!("Plaintext: {:x?}", self.plaintext); + log::info!("Result: {:x?}", output); if self.plaintext.len() != output.len() { Err("decrypt error: plaintext and output lengths do not match")?; }