Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...

[cascardo/linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 9459dfd..29a0cbd 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1678,16 +1678,14 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,
        }
 
        do {
-               struct {
-                       struct shash_desc shash;
-                       char ctx[crypto_shash_descsize(tfm)];
-               } sdesc;
+               SHASH_DESC_ON_STACK(shash, tfm);
+               u32 *ctx = (u32 *)shash_desc_ctx(shash);
 
-               sdesc.shash.tfm = tfm;
-               sdesc.shash.flags = 0;
+               shash->tfm = tfm;
+               shash->flags = 0;
 
-               *(u32 *)sdesc.ctx = le32_to_cpu(420553207);
-               err = crypto_shash_final(&sdesc.shash, (u8 *)&val);
+               *ctx = le32_to_cpu(420553207);
+               err = crypto_shash_final(shash, (u8 *)&val);
                if (err) {
                        printk(KERN_ERR "alg: crc32c: Operation failed for "
                               "%s: %d\n", driver, err);