Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[platform/kernel/linux-starfive.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 428a5f8..6863f91 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -4441,6 +4441,15 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .cipher = __VECS(tf_cbc_tv_template)
                },
        }, {
+#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
+               .alg = "cbc-paes-s390",
+               .fips_allowed = 1,
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(aes_cbc_tv_template)
+               }
+       }, {
+#endif
                .alg = "cbcmac(aes)",
                .fips_allowed = 1,
                .test = alg_test_hash,
@@ -4592,6 +4601,15 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .cipher = __VECS(tf_ctr_tv_template)
                }
        }, {
+#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
+               .alg = "ctr-paes-s390",
+               .fips_allowed = 1,
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(aes_ctr_tv_template)
+               }
+       }, {
+#endif
                .alg = "cts(cbc(aes))",
                .test = alg_test_skcipher,
                .fips_allowed = 1,
@@ -4884,6 +4902,15 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .cipher = __VECS(xtea_tv_template)
                }
        }, {
+#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
+               .alg = "ecb-paes-s390",
+               .fips_allowed = 1,
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(aes_tv_template)
+               }
+       }, {
+#endif
                .alg = "ecdh",
                .test = alg_test_kpp,
                .fips_allowed = 1,
@@ -5471,6 +5498,15 @@ static const struct alg_test_desc alg_test_descs[] = {
                        .cipher = __VECS(tf_xts_tv_template)
                }
        }, {
+#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
+               .alg = "xts-paes-s390",
+               .fips_allowed = 1,
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = __VECS(aes_xts_tv_template)
+               }
+       }, {
+#endif
                .alg = "xts4096(paes)",
                .test = alg_test_null,
                .fips_allowed = 1,