From 36cbde7c30ead127dcd7c03b96d4dabf10a6d6c5 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 27 Oct 2014 17:25:52 +0100 Subject: target-ppc: simplify AES emulation This patch simplifies the AES code, by directly accessing the newly added S-Box, InvS-Box tables instead of recreating them by using the AES_Te and AES_Td tables. Cc: Alexander Graf Cc: Paolo Bonzini Signed-off-by: Aurelien Jarno Reviewed-by: Paolo Bonzini Tested-by: Tom Musta Signed-off-by: Alexander Graf --- target-ppc/int_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c index 83c1ad0654..1c7e0f1f77 100644 --- a/target-ppc/int_helper.c +++ b/target-ppc/int_helper.c @@ -2352,7 +2352,7 @@ void helper_vcipherlast(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) int i; VECTOR_FOR_INORDER_I(i, u8) { - r->AVRB(i) = b->AVRB(i) ^ (AES_Te4[a->AVRB(AES_shifts[i])] & 0xFF); + r->AVRB(i) = b->AVRB(i) ^ (AES_sbox[a->AVRB(AES_shifts[i])]); } } @@ -2381,7 +2381,7 @@ void helper_vncipherlast(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) int i; VECTOR_FOR_INORDER_I(i, u8) { - r->AVRB(i) = b->AVRB(i) ^ (AES_Td4[a->AVRB(AES_ishifts[i])] & 0xFF); + r->AVRB(i) = b->AVRB(i) ^ (AES_isbox[a->AVRB(AES_ishifts[i])]); } } -- cgit v1.2.3