From: Niels Möller <nisse@lysator.liu.se>
Date: Sun, 20 Nov 2011 20:01:51 +0000 (+0100)
Subject: Take ALIGNOF_UINT64_T into account when getting the offset for the
X-Git-Tag: converted-master-branch-to-git~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e647c3f5a6fc79bf78266d6297e284ff7703647;p=thirdparty%2Fnettle.git

Take ALIGNOF_UINT64_T into account when getting the offset for the
subkeys. Differs between w32 and other systems. w32 problem identified
by Martin Storsjö.

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

diff --git a/x86/camellia-crypt-internal.asm b/x86/camellia-crypt-internal.asm
index 46a4e3d9..fa16f763 100644
--- a/x86/camellia-crypt-internal.asm
+++ b/x86/camellia-crypt-internal.asm
@@ -173,9 +173,9 @@ PROLOGUE(_nettle_camellia_crypt)
 	subl	$8, TMP
 	movl	TMP, FRAME_CNT
 	C 	Whitening using first subkey 
-	xorl	4(KEY), L0
-	xorl	8(KEY), H0
-	addl	$12, KEY
+	addl	$ALIGNOF_UINT64_T + 8, KEY
+	xorl	-8(KEY), L0
+	xorl	-4(KEY), H0
 
 	movl	FRAME_TABLE, T