Merge 4.19.19 into android-4.19

[android-x86/kernel.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index a1d4224..1ffa4b3 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 = {
@@ -2685,6 +2697,13 @@ static const struct alg_test_desc alg_test_descs[] = {
                        }
                }
        }, {
+               .alg = "cfb(aes)",
+               .test = alg_test_skcipher,
+               .fips_allowed = 1,
+               .suite = {
+                       .cipher = __VECS(aes_cfb_tv_template)
+               },
+       }, {
                .alg = "chacha20",
                .test = alg_test_skcipher,
                .suite = {
@@ -3038,18 +3057,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .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,
                .suite = {
@@ -3292,6 +3299,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                        }
                }
        }, {
+               .alg = "nhpoly1305",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(nhpoly1305_tv_template)
+               }
+       }, {
                .alg = "ofb(aes)",
                .test = alg_test_skcipher,
                .fips_allowed = 1,
@@ -3545,6 +3558,18 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .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,
                .fips_allowed = 1,
@@ -3577,18 +3602,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .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,
                .suite = {