Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "API:
   - Add support for AEAD in simd
   - Add fuzz testing to testmgr
   - Add panic_on_fail module parameter to testmgr
   - Use per-CPU struct instead multiple variables in scompress
   - Change verify API for akcipher

  Algorithms:
   - Convert x86 AEAD algorithms over to simd
   - Forbid 2-key 3DES in FIPS mode
   - Add EC-RDSA (GOST 34.10) algorithm

  Drivers:
   - Set output IV with ctr-aes in crypto4xx
   - Set output IV in rockchip
   - Fix potential length overflow with hashing in sun4i-ss
   - Fix computation error with ctr in vmx
   - Add SM4 protected keys support in ccree
   - Remove long-broken mxc-scc driver
   - Add rfc4106(gcm(aes)) cipher support in cavium/nitrox"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (179 commits)
  crypto: ccree - use a proper le32 type for le32 val
  crypto: ccree - remove set but not used variable 'du_size'
  crypto: ccree - Make cc_sec_disable static
  crypto: ccree - fix spelling mistake "protedcted" -> "protected"
  crypto: caam/qi2 - generate hash keys in-place
  crypto: caam/qi2 - fix DMA mapping of stack memory
  crypto: caam/qi2 - fix zero-length buffer DMA mapping
  crypto: stm32/cryp - update to return iv_out
  crypto: stm32/cryp - remove request mutex protection
  crypto: stm32/cryp - add weak key check for DES
  crypto: atmel - remove set but not used variable 'alg_name'
  crypto: picoxcell - Use dev_get_drvdata()
  crypto: crypto4xx - get rid of redundant using_sd variable
  crypto: crypto4xx - use sync skcipher for fallback
  crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues
  crypto: crypto4xx - fix ctr-aes missing output IV
  crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA
  crypto: ux500 - use ccflags-y instead of CFLAGS_<basename>.o
  crypto: ccree - handle tee fips error during power management resume
  crypto: ccree - add function to handle cryptocell tee fips error
  ...

1 files changed, 14 insertions, 13 deletions

diff --git a/crypto/streebog_generic.c b/crypto/streebog_generic.c
index 5a2eafed9c29..63663c3bab7e 100644
--- a/crypto/streebog_generic.c
+++ b/crypto/streebog_generic.c
@@ -996,7 +996,7 @@ static void streebog_add512(const struct streebog_uint512 *x,
 
 static void streebog_g(struct streebog_uint512 *h,
                        const struct streebog_uint512 *N,
-                       const u8 *m)
+                       const struct streebog_uint512 *m)
 {
         struct streebog_uint512 Ki, data;
         unsigned int i;
@@ -1005,7 +1005,7 @@ static void streebog_g(struct streebog_uint512 *h,
 
         /* Starting E() */
         Ki = data;
-        streebog_xlps(&Ki, (const struct streebog_uint512 *)&m[0], &data);
+        streebog_xlps(&Ki, m, &data);
 
         for (i = 0; i < 11; i++)
                 streebog_round(i, &Ki, &data);
@@ -1015,16 +1015,19 @@ static void streebog_g(struct streebog_uint512 *h,
         /* E() done */
 
         streebog_xor(&data, h, &data);
-        streebog_xor(&data, (const struct streebog_uint512 *)&m[0], h);
+        streebog_xor(&data, m, h);
 }
 
 static void streebog_stage2(struct streebog_state *ctx, const u8 *data)
 {
-        streebog_g(&ctx->h, &ctx->N, data);
+        struct streebog_uint512 m;
+
+        memcpy(&m, data, sizeof(m));
+
+        streebog_g(&ctx->h, &ctx->N, &m);
 
         streebog_add512(&ctx->N, &buffer512, &ctx->N);
-        streebog_add512(&ctx->Sigma, (const struct streebog_uint512 *)data,
-                        &ctx->Sigma);
+        streebog_add512(&ctx->Sigma, &m, &ctx->Sigma);
 }
 
 static void streebog_stage3(struct streebog_state *ctx)
@@ -1034,13 +1037,11 @@ static void streebog_stage3(struct streebog_state *ctx)
         buf.qword[0] = cpu_to_le64(ctx->fillsize << 3);
         streebog_pad(ctx);
 
-        streebog_g(&ctx->h, &ctx->N, (const u8 *)&ctx->buffer);
+        streebog_g(&ctx->h, &ctx->N, &ctx->m);
         streebog_add512(&ctx->N, &buf, &ctx->N);
-        streebog_add512(&ctx->Sigma,
-                        (const struct streebog_uint512 *)&ctx->buffer[0],
-                        &ctx->Sigma);
-        streebog_g(&ctx->h, &buffer0, (const u8 *)&ctx->N);
-        streebog_g(&ctx->h, &buffer0, (const u8 *)&ctx->Sigma);
+        streebog_add512(&ctx->Sigma, &ctx->m, &ctx->Sigma);
+        streebog_g(&ctx->h, &buffer0, &ctx->N);
+        streebog_g(&ctx->h, &buffer0, &ctx->Sigma);
         memcpy(&ctx->hash, &ctx->h, sizeof(struct streebog_uint512));
 }
 
@@ -1127,7 +1128,7 @@ static void __exit streebog_mod_fini(void)
         crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
 }
 
-module_init(streebog_mod_init);
+subsys_initcall(streebog_mod_init);
 module_exit(streebog_mod_fini);
 
 MODULE_LICENSE("GPL");