diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2013-05-16 15:56:41 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2013-05-16 15:56:41 +0200 |
| commit | 444c99c17d112927cf7ff6d01b967a897d55e7db (patch) | |
| tree | 86a913a607b0faa03046dee18e94dea1ff80ac20 /arm | |
| parent | 23cd4cf7aea5b4c13135dd38b6e88423a045836a (diff) | |
| download | nettle-444c99c17d112927cf7ff6d01b967a897d55e7db.tar.gz | |
arm: Renamed AES_FINAL_ROUND.
Diffstat (limited to 'arm')
| -rw-r--r-- | arm/aes.m4 | 4 | ||||
| -rw-r--r-- | arm/v6/aes-decrypt-internal.asm | 8 | ||||
| -rw-r--r-- | arm/v6/aes-encrypt-internal.asm | 8 |
3 files changed, 10 insertions, 10 deletions
@@ -23,8 +23,8 @@ define(<AES_STORE>, < strb $2, [$1], #+1 >) -C AES_FINAL_ROUND(a,b,c,d,key,res) -define(<AES_FINAL_ROUND>, < +C AES_FINAL_ROUND_V6(a,b,c,d,key,res) +define(<AES_FINAL_ROUND_V6>, < 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} |