drm/sun4i: Pass modifier to backend and frontend format support helpers

[linux-2.6-microblaze.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index a1d4224..b1f79c6 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1400,8 +1400,8 @@ static int test_comp(struct crypto_comp *tfm,
                int ilen;
                unsigned int dlen = COMP_BUF_SIZE;
 
-               memset(output, 0, sizeof(COMP_BUF_SIZE));
-               memset(decomp_output, 0, sizeof(COMP_BUF_SIZE));
+               memset(output, 0, COMP_BUF_SIZE);
+               memset(decomp_output, 0, COMP_BUF_SIZE);
 
                ilen = ctemplate[i].inlen;
                ret = crypto_comp_compress(tfm, ctemplate[i].input,
@@ -1445,7 +1445,7 @@ static int test_comp(struct crypto_comp *tfm,
                int ilen;
                unsigned int dlen = COMP_BUF_SIZE;
 
-               memset(decomp_output, 0, sizeof(COMP_BUF_SIZE));
+               memset(decomp_output, 0, COMP_BUF_SIZE);
 
                ilen = dtemplate[i].inlen;
                ret = crypto_comp_decompress(tfm, dtemplate[i].input,
@@ -2661,6 +2661,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .cipher = __VECS(serpent_cbc_tv_template)
                },
+       }, {
+               .alg = "cbc(sm4)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(sm4_cbc_tv_template)
+               }
        }, {
                .alg = "cbc(twofish)",
                .test = alg_test_skcipher,
@@ -2784,6 +2790,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .cipher = __VECS(serpent_ctr_tv_template)
                }
+       }, {
+               .alg = "ctr(sm4)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(sm4_ctr_tv_template)
+               }
        }, {
                .alg = "ctr(twofish)",
                .test = alg_test_skcipher,
@@ -3037,18 +3049,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .cipher = __VECS(sm4_tv_template)
                }
-       }, {
-               .alg = "ecb(speck128)",
-               .test = alg_test_skcipher,
-               .suite = {
-                       .cipher = __VECS(speck128_tv_template)
-               }
-       }, {
-               .alg = "ecb(speck64)",
-               .test = alg_test_skcipher,
-               .suite = {
-                       .cipher = __VECS(speck64_tv_template)
-               }
        }, {
                .alg = "ecb(tea)",
                .test = alg_test_skcipher,
@@ -3576,18 +3576,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .cipher = __VECS(serpent_xts_tv_template)
                }
-       }, {
-               .alg = "xts(speck128)",
-               .test = alg_test_skcipher,
-               .suite = {
-                       .cipher = __VECS(speck128_xts_tv_template)
-               }
-       }, {
-               .alg = "xts(speck64)",
-               .test = alg_test_skcipher,
-               .suite = {
-                       .cipher = __VECS(speck64_xts_tv_template)
-               }
        }, {
                .alg = "xts(twofish)",
                .test = alg_test_skcipher,