From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 15 May 2002 09:43:03 +0000 (+0200)
Subject: * x86/aes-encrypt.asm (aes_encrypt): Use AES_SUBST_BYTE.
X-Git-Tag: nettle_1.6_release_20021003~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5578a0d2bbd2e54baf8e61a5d6f6249516923c8f;p=thirdparty%2Fnettle.git

* x86/aes-encrypt.asm (aes_encrypt): Use AES_SUBST_BYTE.
* x86/aes-decrypt.asm (aes_decrypt): Likewise.

Rev: src/nettle/x86/aes-decrypt.asm:1.10
---

diff --git a/x86/aes-decrypt.asm b/x86/aes-decrypt.asm
index 76590884..99f78cbf 100644
--- a/x86/aes-decrypt.asm
+++ b/x86/aes-decrypt.asm
@@ -107,28 +107,10 @@ aes_decrypt:
 	popl	%eax
 	xchgl	%ebx,%edx
 
-	C // inverse S-box substitution
+	C inverse S-box substitution
 	mov	$4,%edi
 .Lisubst:
-	movl	%eax,%ebp
-	andl	$0x000000ff,%ebp
-	movb	AES_SBOX + _aes_decrypt_table (%ebp),%al
-	roll	$8,%eax
-
-	movl	%ebx,%ebp
-	andl	$0x000000ff,%ebp
-	movb	AES_SBOX + _aes_decrypt_table (%ebp),%bl
-	roll	$8,%ebx
-
-	movl	%ecx,%ebp
-	andl	$0x000000ff,%ebp
-	movb	AES_SBOX + _aes_decrypt_table (%ebp),%cl
-	roll	$8,%ecx
-
-	movl	%edx,%ebp
-	andl	$0x000000ff,%ebp
-	movb	AES_SBOX + _aes_decrypt_table (%ebp),%dl
-	roll	$8,%edx
+	AES_SUBST_BYTE(_aes_decrypt_table)
 
 	decl	%edi
 	jnz	.Lisubst
@@ -155,5 +137,5 @@ aes_decrypt:
 	popl	%ebp
 	popl	%ebx
 	ret
-.eord:
-	.size	aes_decrypt,.eord-aes_decrypt
+.Leord:
+	.size	aes_decrypt,.Leord-aes_decrypt