Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
444c99c1
Commit
444c99c1
authored
May 16, 2013
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
arm: Renamed AES_FINAL_ROUND.
parent
23cd4cf7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
12 deletions
+14
-12
ChangeLog
ChangeLog
+4
-2
arm/aes.m4
arm/aes.m4
+2
-2
arm/v6/aes-decrypt-internal.asm
arm/v6/aes-decrypt-internal.asm
+4
-4
arm/v6/aes-encrypt-internal.asm
arm/v6/aes-encrypt-internal.asm
+4
-4
No files found.
ChangeLog
View file @
444c99c1
2013-05-16 Niels Möller <nisse@lysator.liu.se>
* 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.
...
...
arm/aes.m4
View file @
444c99c1
...
...
@@ -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
...
...
arm/v6/aes-decrypt-internal.asm
View file @
444c99c1
...
...
@@ -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
,
DS
T
,
SRC
}
...
...
arm/v6/aes-encrypt-internal.asm
View file @
444c99c1
...
...
@@ -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
,
DS
T
,
SRC
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment