Merge tag 'ia64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[~andy/linux] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index bb54b882d7380187371c9596411656bdd9af75be..5674878ff6c18d244ec23b4f8b7815647a814c9b 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1845,6 +1845,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "ctr(camellia)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = camellia_ctr_enc_tv_template,
+                                       .count = CAMELLIA_CTR_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = camellia_ctr_dec_tv_template,
+                                       .count = CAMELLIA_CTR_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "ctr(serpent)",
                .test = alg_test_skcipher,
@@ -2296,6 +2311,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "lrw(camellia)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = camellia_lrw_enc_tv_template,
+                                       .count = CAMELLIA_LRW_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = camellia_lrw_dec_tv_template,
+                                       .count = CAMELLIA_LRW_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "lrw(serpent)",
                .test = alg_test_skcipher,
@@ -2633,6 +2663,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "xts(camellia)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = camellia_xts_enc_tv_template,
+                                       .count = CAMELLIA_XTS_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = camellia_xts_dec_tv_template,
+                                       .count = CAMELLIA_XTS_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "xts(serpent)",
                .test = alg_test_skcipher,