1 files changed, 150 insertions, 0 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index e91c1eb1722a..bb54b882d738 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1534,6 +1534,21 @@ 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 = "__cbc-serpent-sse2",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__driver-cbc-aes-aesni",
                 .test = alg_test_null,
                 .suite = {
@@ -1549,6 +1564,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__driver-cbc-serpent-sse2",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__driver-ecb-aes-aesni",
                 .test = alg_test_null,
                 .suite = {
@@ -1564,6 +1594,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__driver-ecb-serpent-sse2",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__ghash-pclmulqdqni",
                 .test = alg_test_null,
                 .suite = {
@@ -1675,6 +1720,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "cbc(serpent)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = serpent_cbc_enc_tv_template,
+                                        .count = SERPENT_CBC_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = serpent_cbc_dec_tv_template,
+                                        .count = SERPENT_CBC_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "cbc(twofish)",
                 .test = alg_test_skcipher,
                 .suite = {
@@ -1731,6 +1791,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "cryptd(__driver-ecb-serpent-sse2)",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "cryptd(__ghash-pclmulqdqni)",
                 .test = alg_test_null,
                 .suite = {
@@ -1771,6 +1846,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "ctr(serpent)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = serpent_ctr_enc_tv_template,
+                                        .count = SERPENT_CTR_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = serpent_ctr_dec_tv_template,
+                                        .count = SERPENT_CTR_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "ctr(twofish)",
                 .test = alg_test_skcipher,
                 .suite = {
@@ -2207,6 +2297,36 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "lrw(serpent)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = serpent_lrw_enc_tv_template,
+                                        .count = SERPENT_LRW_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = serpent_lrw_dec_tv_template,
+                                        .count = SERPENT_LRW_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
+                .alg = "lrw(twofish)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = tf_lrw_enc_tv_template,
+                                        .count = TF_LRW_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = tf_lrw_dec_tv_template,
+                                        .count = TF_LRW_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "lzo",
                 .test = alg_test_comp,
                 .suite = {
@@ -2514,6 +2634,36 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "xts(serpent)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = serpent_xts_enc_tv_template,
+                                        .count = SERPENT_XTS_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = serpent_xts_dec_tv_template,
+                                        .count = SERPENT_XTS_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
+                .alg = "xts(twofish)",
+                .test = alg_test_skcipher,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = tf_xts_enc_tv_template,
+                                        .count = TF_XTS_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = tf_xts_dec_tv_template,
+                                        .count = TF_XTS_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "zlib",
                 .test = alg_test_pcomp,
                 .suite = {