From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 20 Sep 2010 09:15:18 +0000 (+0200)
Subject: (ROUND): Adapted to new key convention, moving key xor to the end.
X-Git-Tag: nettle_2.2_release_20110711~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c948ab8875fa76a5a4dcdb0de16cb4aaa549bac;p=thirdparty%2Fnettle.git

(ROUND): Adapted to new key convention, moving key xor to the end.

Rev: nettle/x86/camellia-crypt-internal.asm:1.2
---

diff --git a/x86/camellia-crypt-internal.asm b/x86/camellia-crypt-internal.asm
index b5c491c8..82431722 100644
--- a/x86/camellia-crypt-internal.asm
+++ b/x86/camellia-crypt-internal.asm
@@ -78,13 +78,13 @@ define(<ROUND>, <
 	movzbl	HREG($2), TMP
 	xorl	SP1110(TMP), $3
 
-	xorl	$5(KEY), $4
-	xorl	$5 + 4(KEY), $3
-
 	xorl	$3, $4
 	rorl	<$>8, $3
 	xorl	$4, $3
 
+	xorl	$5(KEY), $3
+	xorl	$5 + 4(KEY), $4
+
 	xorl	FRAME_$3, $3
 	xorl	FRAME_$4, $4
 >)