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

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

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

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