Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index b1f79c6bf40965b938b69bd877182788556d6f9e..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 = {
@@ -2690,6 +2702,13 @@ static const struct alg_test_desc alg_test_descs[] = {
                                .dec = __VECS(aes_ccm_dec_tv_template)
                        }
                }
+       }, {
+               .alg = "cfb(aes)",
+               .test = alg_test_skcipher,
+               .fips_allowed = 1,
+               .suite = {
+                       .cipher = __VECS(aes_cfb_tv_template)
+               },
        }, {
                .alg = "chacha20",
                .test = alg_test_skcipher,
@@ -2805,6 +2824,7 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "cts(cbc(aes))",
                .test = alg_test_skcipher,
+               .fips_allowed = 1,
                .suite = {
                        .cipher = __VECS(cts_mode_tv_template)
                }
@@ -3184,6 +3204,18 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(hmac_sha512_tv_template)
                }
+       }, {
+               .alg = "hmac(streebog256)",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(hmac_streebog256_tv_template)
+               }
+       }, {
+               .alg = "hmac(streebog512)",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(hmac_streebog512_tv_template)
+               }
        }, {
                .alg = "jitterentropy_rng",
                .fips_allowed = 1,
@@ -3291,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,
@@ -3496,6 +3534,18 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(sm3_tv_template)
                }
+       }, {
+               .alg = "streebog256",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(streebog256_tv_template)
+               }
+       }, {
+               .alg = "streebog512",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(streebog512_tv_template)
+               }
        }, {
                .alg = "tgr128",
                .test = alg_test_hash,
@@ -3544,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,