* camellia.c: Rewrote to use 64-bit type for subkeys and use

64-bit operations throughout. Performance on x86_32, when compiled
with gcc-4.4.4, is reduced by roughly 15%, this should be fixed
later.

* camellia.h (struct camellia_ctx): Use type uint64_t for subkeys.

Rev: nettle/ChangeLog:1.93
Rev: nettle/camellia.c:1.3
Rev: nettle/camellia.h:1.3

ChangeLog

+2010-07-20  Niels Mller  <nisse@lysator.liu.se>
+
+	* camellia.c: Rewrote to use 64-bit type for subkeys and use
+	64-bit operations throughout. Performance on x86_32, when compiled
+	with gcc-4.4.4, is reduced by roughly 15%, this should be fixed
+	later.
+
+	* camellia.h (struct camellia_ctx): Use type uint64_t for subkeys.
+
 2010-07-07  Niels Mller  <nisse@lysator.liu.se>
 
 	* aes.h (aes_encrypt, aes_decrypt): Declare ctx argument as const.

camellia.h

@@ -53,8 +53,7 @@ struct camellia_ctx
      post-whitening keys is folded fith the round keys, so that subkey
      subkey #1 and the last one (#25 or #33) is not used. FIXME:
      Renumber to eliminate them. */
-  /* FIXME: For 64-bit machines, don't split in 32-bit halves. */
-  uint32_t keys[34][2];
+  uint64_t keys[34];
 };
 
 void