tools headers UAPI: Sync drm/i915_drm.h with the kernel sources

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

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 321e38e..9335999 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -33,10 +33,13 @@
 #include <crypto/akcipher.h>
 #include <crypto/kpp.h>
 #include <crypto/acompress.h>
+#include <crypto/internal/cipher.h>
 #include <crypto/internal/simd.h>
 
 #include "internal.h"
 
+MODULE_IMPORT_NS(CRYPTO_INTERNAL);
+
 static bool notests;
 module_param(notests, bool, 0644);
 MODULE_PARM_DESC(notests, "disable crypto self-tests");
@@ -4873,12 +4876,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .cipher = __VECS(tea_tv_template)
                }
-       }, {
-               .alg = "ecb(tnepres)",
-               .test = alg_test_skcipher,
-               .suite = {
-                       .cipher = __VECS(tnepres_tv_template)
-               }
        }, {
                .alg = "ecb(twofish)",
                .test = alg_test_skcipher,
@@ -4954,12 +4951,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(hmac_md5_tv_template)
                }
-       }, {
-               .alg = "hmac(rmd128)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(hmac_rmd128_tv_template)
-               }
        }, {
                .alg = "hmac(rmd160)",
                .test = alg_test_hash,
@@ -5272,30 +5263,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                                .aad_iv = 1,
                        }
                }
-       }, {
-               .alg = "rmd128",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(rmd128_tv_template)
-               }
        }, {
                .alg = "rmd160",
                .test = alg_test_hash,
                .suite = {
                        .hash = __VECS(rmd160_tv_template)
                }
-       }, {
-               .alg = "rmd256",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(rmd256_tv_template)
-               }
-       }, {
-               .alg = "rmd320",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(rmd320_tv_template)
-               }
        }, {
                .alg = "rsa",
                .test = alg_test_akcipher,
@@ -5303,12 +5276,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .akcipher = __VECS(rsa_tv_template)
                }
-       }, {
-               .alg = "salsa20",
-               .test = alg_test_skcipher,
-               .suite = {
-                       .cipher = __VECS(salsa20_stream_tv_template)
-               }
        }, {
                .alg = "sha1",
                .test = alg_test_hash,
@@ -5396,24 +5363,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(streebog512_tv_template)
                }
-       }, {
-               .alg = "tgr128",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(tgr128_tv_template)
-               }
-       }, {
-               .alg = "tgr160",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(tgr160_tv_template)
-               }
-       }, {
-               .alg = "tgr192",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = __VECS(tgr192_tv_template)
-               }
        }, {
                .alg = "vmac64(aes)",
                .test = alg_test_hash,