Skip to content
Snippets Groups Projects
Commit 9e6cf9fe authored by Niels Möller's avatar Niels Möller
Browse files

(aes_decrypt): Use _aes_decrypt_table instead of 

itbl1-4. Commented out the inclusion of aes_tables.asm.

Rev: src/nettle/x86/aes.asm:1.11
parent b3ffb2f0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 13 deletions
x86/aes.asm
+ 13
− 13
View file @ 9e6cf9fe
...@@ -22,7 +22,7 @@ C MA 02111-1307, USA. ...@@ -22,7 +22,7 @@ C MA 02111-1307, USA.
.data .data
include_src(<x86/aes_tables.asm>) C include_src(<x86/aes_tables.asm>)
...@@ -105,19 +105,19 @@ aes_decrypt: ...@@ -105,19 +105,19 @@ aes_decrypt:
movl %edx,%esi C copy first in movl %edx,%esi C copy first in
andl $0x000000ff,%esi C clear all but offset andl $0x000000ff,%esi C clear all but offset
shll $2,%esi C index in itbl1 shll $2,%esi C index in itbl1
movl itbl1(%esi),%edi movl AES_TABLE0 + _aes_decrypt_table (%esi),%edi
movl %eax,%esi C second one movl %eax,%esi C second one
shrl $6,%esi shrl $6,%esi
andl $0x000003fc,%esi C clear all but offset bytes andl $0x000003fc,%esi C clear all but offset bytes
xorl itbl2(%esi),%edi xorl AES_TABLE1 + _aes_decrypt_table (%esi),%edi
movl %ebx,%esi C third one movl %ebx,%esi C third one
shrl $14,%esi shrl $14,%esi
andl $0x000003fc,%esi andl $0x000003fc,%esi
xorl itbl3(%esi),%edi xorl AES_TABLE2 + _aes_decrypt_table (%esi),%edi
movl %ecx,%esi C fourth one movl %ecx,%esi C fourth one
shrl $22,%esi shrl $22,%esi
andl $0x000003fc,%esi andl $0x000003fc,%esi
xorl itbl4(%esi),%edi xorl AES_TABLE3 + _aes_decrypt_table (%esi),%edi
pushl %edi pushl %edi
C // Third column C // Third column
...@@ -125,19 +125,19 @@ aes_decrypt: ...@@ -125,19 +125,19 @@ aes_decrypt:
movl %ecx,%esi C copy first in movl %ecx,%esi C copy first in
andl $0x000000ff,%esi C clear all but offset andl $0x000000ff,%esi C clear all but offset
shll $2,%esi C index in itbl1 shll $2,%esi C index in itbl1
movl itbl1(%esi),%edi movl AES_TABLE0 + _aes_decrypt_table (%esi),%edi
movl %edx,%esi C second one movl %edx,%esi C second one
shrl $6,%esi shrl $6,%esi
andl $0x000003fc,%esi C clear all but offset bytes andl $0x000003fc,%esi C clear all but offset bytes
xorl itbl2(%esi),%edi xorl AES_TABLE1 + _aes_decrypt_table (%esi),%edi
movl %eax,%esi C third one movl %eax,%esi C third one
shrl $14,%esi shrl $14,%esi
andl $0x000003fc,%esi andl $0x000003fc,%esi
xorl itbl3(%esi),%edi xorl AES_TABLE2 + _aes_decrypt_table (%esi),%edi
movl %ebx,%esi C fourth one movl %ebx,%esi C fourth one
shrl $22,%esi shrl $22,%esi
andl $0x000003fc,%esi andl $0x000003fc,%esi
xorl itbl4(%esi),%edi xorl AES_TABLE3 + _aes_decrypt_table (%esi),%edi
pushl %edi C save first on stack pushl %edi C save first on stack
C // Fourth column C // Fourth column
...@@ -145,19 +145,19 @@ aes_decrypt: ...@@ -145,19 +145,19 @@ aes_decrypt:
movl %ebx,%esi C copy first in movl %ebx,%esi C copy first in
andl $0x000000ff,%esi C clear all but offset andl $0x000000ff,%esi C clear all but offset
shll $2,%esi C index in itbl1 shll $2,%esi C index in itbl1
movl itbl1(%esi),%edi movl AES_TABLE0 + _aes_decrypt_table (%esi),%edi
movl %ecx,%esi C second one movl %ecx,%esi C second one
shrl $6,%esi shrl $6,%esi
andl $0x000003fc,%esi C clear all but offset bytes andl $0x000003fc,%esi C clear all but offset bytes
xorl itbl2(%esi),%edi xorl AES_TABLE1 + _aes_decrypt_table (%esi),%edi
movl %edx,%esi C third one movl %edx,%esi C third one
shrl $14,%esi shrl $14,%esi
andl $0x000003fc,%esi andl $0x000003fc,%esi
xorl itbl3(%esi),%edi xorl AES_TABLE2 + _aes_decrypt_table (%esi),%edi
movl %eax,%esi C fourth one movl %eax,%esi C fourth one
shrl $22,%esi shrl $22,%esi
andl $0x000003fc,%esi andl $0x000003fc,%esi
xorl itbl4(%esi),%edi xorl AES_TABLE3 + _aes_decrypt_table (%esi),%edi
movl %edi,%edx movl %edi,%edx
popl %ecx popl %ecx
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment