* x86/aes-encrypt.asm (aes_encrypt): Use AES_LOAD macro.

Rev: src/nettle/x86/aes-encrypt.asm:1.8

diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index e929b8776a0d00857e63bb14dc6b2ca5a2a8dc0f..189060caeb97c9100c73b95d06113f151dec280e 100644 (file)
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -55,20 +55,11 @@ aes_encrypt:
        jz      .Lencrypt_end
        
 .Lencrypt_block_loop:
-       movl    32(%esp),%esi   C  address of plaintext
-       movl    (%esi),%eax     C  load plaintext into registers
-       movl    4(%esi),%ebx
-       movl    8(%esi),%ecx
-       movl    12(%esi),%edx
-       
-       addl    $16, 32(%esp)   C Increment src pointer
-C .Laes_got_plain: 
        movl    20(%esp),%esi   C  address of context struct ctx
-       xorl    (%esi),%eax     C  add first key to plaintext
-       xorl    4(%esi),%ebx
-       xorl    8(%esi),%ecx
-       xorl    12(%esi),%edx
-C .Laes_xored_initial:
+       movl    32(%esp),%ebp   C  address of plaintext
+       AES_LOAD(%esi, %ebp)
+       addl    $16, 32(%esp)   C Increment src pointer
+               
        C FIXME:        Use %esi instead
        movl    20(%esp),%ebp   C  address of context struct
        movl    AES_NROUNDS (%ebp),%ebp C  get number of rounds to do from struct