From: Niels Möller <nisse@lysator.liu.se>
Date: Tue, 14 May 2002 17:15:12 +0000 (+0200)
Subject: * x86/aes-encrypt.asm (aes_encrypt): Use the AES_LAST_ROUND macro
X-Git-Tag: nettle_1.6_release_20021003~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e50baece92dd8a8c2faec348e5cac18803695283;p=thirdparty%2Fnettle.git

* x86/aes-encrypt.asm (aes_encrypt): Use the AES_LAST_ROUND macro
for the first column of the final round.
(aes_encrypt): Similarly for the second column.

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

diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index 528f2ee0..e5dbf6b7 100644
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -181,24 +181,13 @@ C .Laes_got_t:
 	jnz	.Laes_encrypt_loop
 
 	C last round
-	C first column
 
+	C first column
 	AES_LAST_ROUND(a,b,c,d)
 	pushl	%edi
 
-	C // second column
-	C d a b c
-	movl	%eax,%edi
-	andl	$0x0000ff00,%edi
-	movl	%ebx,%ebp
-	andl	$0x00ff0000,%ebp
-	orl	%ebp,%edi
-	movl	%ecx,%ebp
-	andl	$0xff000000,%ebp
-	orl	%ebp,%edi
-	movl	%edx,%ebp
-	andl	$0x000000ff,%ebp
-	orl	%ebp,%edi
+	C second column
+	AES_LAST_ROUND(d,a,b,c)
 	pushl	%edi
 
 	C c d a b