Merge tag 'v6.2-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 589189c9fced55e745822cee378e620437788634..4476ac97baa5e45aa1e57665070a260b49196691 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -4712,6 +4712,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "cts(cbc(paes))",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "cts(cbc(sm4))",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(sm4_cts_tv_template)
+               }
        }, {
                .alg = "curve25519",
                .test = alg_test_kpp,
@@ -5586,6 +5592,12 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(aes_xcbc128_tv_template)
                }
+       }, {
+               .alg = "xcbc(sm4)",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = __VECS(sm4_xcbc128_tv_template)
+               }
        }, {
                .alg = "xchacha12",
                .test = alg_test_skcipher,
@@ -5640,6 +5652,13 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .cipher = __VECS(serpent_xts_tv_template)
                }
+       }, {
+               .alg = "xts(sm4)",
+               .generic_driver = "xts(ecb(sm4-generic))",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(sm4_xts_tv_template)
+               }
        }, {
                .alg = "xts(twofish)",
                .generic_driver = "xts(ecb(twofish-generic))",