Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (102 commits)
  crypto: sha-s390 - Fix warnings in import function
  crypto: vmac - New hash algorithm for intel_txt support
  crypto: api - Do not displace newly registered algorithms
  crypto: ansi_cprng - Fix module initialization
  crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx
  crypto: fips - Depend on ansi_cprng
  crypto: blkcipher - Do not use eseqiv on stream ciphers
  crypto: ctr - Use chainiv on raw counter mode
  Revert crypto: fips - Select CPRNG
  crypto: rng - Fix typo
  crypto: talitos - add support for 36 bit addressing
  crypto: talitos - align locks on cache lines
  crypto: talitos - simplify hmac data size calculation
  crypto: mv_cesa - Add support for Orion5X crypto engine
  crypto: cryptd - Add support to access underlaying shash
  crypto: gcm - Use GHASH digest algorithm
  crypto: ghash - Add GHASH digest algorithm for GCM
  crypto: authenc - Convert to ahash
  crypto: api - Fix aligned ctx helper
  crypto: hmac - Prehash ipad/opad
  ...

1 files changed, 7 insertions, 2 deletions

diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c
index b8b66ec3883b..e78b7ee44a74 100644
--- a/crypto/aes_generic.c
+++ b/crypto/aes_generic.c
@@ -1174,7 +1174,7 @@ EXPORT_SYMBOL_GPL(crypto_il_tab);
         ctx->key_enc[6 * i + 11] = t;           \
 } while (0)
 
-#define loop8(i)        do {                    \
+#define loop8tophalf(i) do {                    \
         t = ror32(t, 8);                        \
         t = ls_box(t) ^ rco_tab[i];             \
         t ^= ctx->key_enc[8 * i];                       \
@@ -1185,6 +1185,10 @@ EXPORT_SYMBOL_GPL(crypto_il_tab);
         ctx->key_enc[8 * i + 10] = t;                   \
         t ^= ctx->key_enc[8 * i + 3];                   \
         ctx->key_enc[8 * i + 11] = t;                   \
+} while (0)
+
+#define loop8(i)        do {                            \
+        loop8tophalf(i);                                \
         t  = ctx->key_enc[8 * i + 4] ^ ls_box(t);       \
         ctx->key_enc[8 * i + 12] = t;                   \
         t ^= ctx->key_enc[8 * i + 5];                   \
@@ -1245,8 +1249,9 @@ int crypto_aes_expand_key(struct crypto_aes_ctx *ctx, const u8 *in_key,
                 ctx->key_enc[5] = le32_to_cpu(key[5]);
                 ctx->key_enc[6] = le32_to_cpu(key[6]);
                 t = ctx->key_enc[7] = le32_to_cpu(key[7]);
-                for (i = 0; i < 7; ++i)
+                for (i = 0; i < 6; ++i)
                         loop8(i);
+                loop8tophalf(i);
                 break;
         }