saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-13 07:48:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: aes: fix () warnings on vex

Browse source 
Rust 1.69 adds more warnings on excess punctuation. Remove this to clear
up the warning.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2023-04-20 13:14:36 +08:00
parent ef077ed7de
commit 5e5cc9352b
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/aes/src/vex/aes128.rs
View file

@ -21,7 +21,7 @@ fn set_encrypt_key_inner_128(user_key: &[u8], swap_final: bool) -> VexKeys128 {
^ (TE2[(temp >> 16) & 0xff] & 0xff000000)
^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000)
^ (TE0[(temp) & 0xff] & 0x0000ff00)
^ (TE1[(temp >> 24)] & 0x000000ff)
^ (TE1[temp >> 24] & 0x000000ff)
^ 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];
@ -68,19 +68,19 @@ pub fn aes128_dec_key_schedule(user_key: &[u8]) -> VexKeys128 {
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
let mut rk_offset = 4;
for _ in 1..rounds {
rk[0 + rk_offset] = TD0[TE1[(rk[0 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[0 + rk_offset] = TD0[TE1[rk[0 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[0 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[0 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[0 + rk_offset] as usize) & 0xff] as usize & 0xff];
rk[1 + rk_offset] = TD0[TE1[(rk[1 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[1 + rk_offset] = TD0[TE1[rk[1 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[1 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[1 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[1 + rk_offset] as usize) & 0xff] as usize & 0xff];
rk[2 + rk_offset] = TD0[TE1[(rk[2 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[2 + rk_offset] = TD0[TE1[rk[2 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[2 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[2 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[2 + rk_offset] as usize) & 0xff] as usize & 0xff];
rk[3 + rk_offset] = TD0[TE1[(rk[3 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[3 + rk_offset] = TD0[TE1[rk[3 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[3 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[3 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[3 + rk_offset] as usize) & 0xff] as usize & 0xff];

12
services/aes/src/vex/aes256.rs
View file

@ -26,7 +26,7 @@ fn set_encrypt_key_inner_256(user_key: &[u8], swap_final: bool) -> VexKeys256 {
^ (TE2[(temp >> 16) & 0xff] & 0xff000000)
^ (TE3[(temp >> 8) & 0xff] & 0x00ff0000)
^ (TE0[(temp) & 0xff] & 0x0000ff00)
^ (TE1[(temp >> 24)] & 0x000000ff)
^ (TE1[temp >> 24] & 0x000000ff)
^ 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];
@ -39,7 +39,7 @@ fn set_encrypt_key_inner_256(user_key: &[u8], swap_final: bool) -> VexKeys256 {
let temp = rk[11 + rk_offset] as usize;
rk[12 + rk_offset] = rk[4 + rk_offset]
^ (TE2[(temp >> 24)] & 0xff000000)
^ (TE2[temp >> 24] & 0xff000000)
^ (TE3[(temp >> 16) & 0xff] & 0x00ff0000)
^ (TE0[(temp >> 8) & 0xff] & 0x0000ff00)
^ (TE1[(temp) & 0xff] & 0x000000ff);
@ -90,19 +90,19 @@ pub fn aes256_dec_key_schedule(user_key: &[u8]) -> VexKeys256 {
/* apply the inverse MixColumn transform to all round keys but the first and the last: */
let mut rk_offset = 4;
for _ in 1..rounds {
rk[0 + rk_offset] = TD0[TE1[(rk[0 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[0 + rk_offset] = TD0[TE1[rk[0 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[0 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[0 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[0 + rk_offset] as usize) & 0xff] as usize & 0xff];
rk[1 + rk_offset] = TD0[TE1[(rk[1 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[1 + rk_offset] = TD0[TE1[rk[1 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[1 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[1 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[1 + rk_offset] as usize) & 0xff] as usize & 0xff];
rk[2 + rk_offset] = TD0[TE1[(rk[2 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[2 + rk_offset] = TD0[TE1[rk[2 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[2 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[2 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[2 + rk_offset] as usize) & 0xff] as usize & 0xff];
rk[3 + rk_offset] = TD0[TE1[(rk[3 + rk_offset] as usize >> 24)] as usize & 0xff]
rk[3 + rk_offset] = TD0[TE1[rk[3 + rk_offset] as usize >> 24] as usize & 0xff]
^ TD1[TE1[(rk[3 + rk_offset] as usize >> 16) & 0xff] as usize & 0xff]
^ TD2[TE1[(rk[3 + rk_offset] as usize >> 8) & 0xff] as usize & 0xff]
^ TD3[TE1[(rk[3 + rk_offset] as usize) & 0xff] as usize & 0xff];