Merge tag 'dma-mapping-4.21' of git://git.infradead.org/users/hch/dma-mapping

[linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 379794a259a70745090d9c9b954e0216a38ac2d7..0f684a414acbedc1334de5c939c17863bbafc998 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2404,6 +2404,18 @@ static int alg_test_null(const struct alg_test_desc *desc,
 /* Please keep this list sorted by algorithm name. */
 static const struct alg_test_desc alg_test_descs[] = {
        {
+               .alg = "adiantum(xchacha12,aes)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(adiantum_xchacha12_aes_tv_template)
+               },
+       }, {
+               .alg = "adiantum(xchacha20,aes)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(adiantum_xchacha20_aes_tv_template)
+               },
+       }, {
                .alg = "aegis128",
                .test = alg_test_aead,
                .suite = {
@@ -3311,6 +3323,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                                .dec = __VECS(morus640_dec_tv_template),
                        }
                }
+       }, {
+               .alg = "nhpoly1305",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(nhpoly1305_tv_template)
+               }
        }, {
                .alg = "ofb(aes)",
                .test = alg_test_skcipher,
@@ -3576,6 +3594,18 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(aes_xcbc128_tv_template)
                }
+       }, {
+               .alg = "xchacha12",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(xchacha12_tv_template)
+               },
+       }, {
+               .alg = "xchacha20",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(xchacha20_tv_template)
+               },
        }, {
                .alg = "xts(aes)",
                .test = alg_test_skcipher,