From 444c99c17d112927cf7ff6d01b967a897d55e7db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niels=20M=C3=B6ller?= Date: Thu, 16 May 2013 15:56:41 +0200 Subject: [PATCH] arm: Renamed AES_FINAL_ROUND. --- ChangeLog | 6 ++++-- arm/aes.m4 | 4 ++-- arm/v6/aes-decrypt-internal.asm | 8 ++++---- arm/v6/aes-encrypt-internal.asm | 8 ++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index be4a73a6..5cc88696 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,10 @@ 2013-05-16 Niels Möller - * arm/aes.m4 (AES_ENCRYPT_ROUND, AES_DECRYPT): Moved macros to the + * arm/aes.m4 (AES_FINAL_ROUND_V6): New name, updated callers. + (AES_FINAL_ROUND_): ... old name. Also eliminated one uxtb + instruction. + (AES_ENCRYPT_ROUND, AES_DECRYPT): Moved macros to the files using them. - (AES_FINAL_ROUND): Eliminated one uxtb instruction. * arm/v6/aes-encrypt-internal.asm: Use ALIGN macro. Use 16-byte alignment for loops. diff --git a/arm/aes.m4 b/arm/aes.m4 index d1fdc761..a509b754 100644 --- a/arm/aes.m4 +++ b/arm/aes.m4 @@ -23,8 +23,8 @@ define(, < strb $2, [$1], #+1 >) -C AES_FINAL_ROUND(a,b,c,d,key,res) -define(, < +C AES_FINAL_ROUND_V6(a,b,c,d,key,res) +define(, < uxtb T0, $1 ldrb $6, [TABLE, T0] uxtb T0, $2, ror #8 diff --git a/arm/v6/aes-decrypt-internal.asm b/arm/v6/aes-decrypt-internal.asm index e9b6e570..f550506d 100644 --- a/arm/v6/aes-decrypt-internal.asm +++ b/arm/v6/aes-decrypt-internal.asm @@ -143,10 +143,10 @@ PROLOGUE(_nettle_aes_decrypt) sub TABLE, TABLE, #AES_TABLE0 C Final round - AES_FINAL_ROUND(X0, X3, X2, X1, KEY, W0) - AES_FINAL_ROUND(X1, X0, X3, X2, KEY, W1) - AES_FINAL_ROUND(X2, X1, X0, X3, KEY, W2) - AES_FINAL_ROUND(X3, X2, X1, X0, KEY, W3) + AES_FINAL_ROUND_V6(X0, X3, X2, X1, KEY, W0) + AES_FINAL_ROUND_V6(X1, X0, X3, X2, KEY, W1) + AES_FINAL_ROUND_V6(X2, X1, X0, X3, KEY, W2) + AES_FINAL_ROUND_V6(X3, X2, X1, X0, KEY, W3) pop {LENGTH, DST, SRC} diff --git a/arm/v6/aes-encrypt-internal.asm b/arm/v6/aes-encrypt-internal.asm index 6887b899..3cf13072 100644 --- a/arm/v6/aes-encrypt-internal.asm +++ b/arm/v6/aes-encrypt-internal.asm @@ -149,10 +149,10 @@ PROLOGUE(_nettle_aes_encrypt) sub TABLE, TABLE, #AES_TABLE0 C Final round - AES_FINAL_ROUND(X0, X1, X2, X3, KEY, W0) - AES_FINAL_ROUND(X1, X2, X3, X0, KEY, W1) - AES_FINAL_ROUND(X2, X3, X0, X1, KEY, W2) - AES_FINAL_ROUND(X3, X0, X1, X2, KEY, W3) + AES_FINAL_ROUND_V6(X0, X1, X2, X3, KEY, W0) + AES_FINAL_ROUND_V6(X1, X2, X3, X0, KEY, W1) + AES_FINAL_ROUND_V6(X2, X3, X0, X1, KEY, W2) + AES_FINAL_ROUND_V6(X3, X0, X1, X2, KEY, W3) pop {LENGTH, DST, SRC} -- 2.47.2