Merge remote-tracking branch 'input/next'

[karo-tx-linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 941d75cd1f7cd918ef2ef1b436854cd9ec7abb03..3933241708c2f923fe9b0574446e66077eed9f44 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1726,6 +1726,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "__driver-cbc-camellia-aesni",
+               .test = alg_test_null,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               },
+                               .dec = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               }
+                       }
+               }
        }, {
                .alg = "__driver-cbc-cast5-avx",
                .test = alg_test_null,
@@ -1817,6 +1832,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "__driver-ecb-camellia-aesni",
+               .test = alg_test_null,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               },
+                               .dec = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               }
+                       }
+               }
        }, {
                .alg = "__driver-ecb-cast5-avx",
                .test = alg_test_null,
@@ -2142,6 +2172,22 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "cryptd(__driver-cbc-camellia-aesni)",
+               .test = alg_test_null,
+               .fips_allowed = 1,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               },
+                               .dec = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               }
+                       }
+               }
        }, {
                .alg = "cryptd(__driver-ecb-aes-aesni)",
                .test = alg_test_null,
@@ -2158,6 +2204,22 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "cryptd(__driver-ecb-camellia-aesni)",
+               .test = alg_test_null,
+               .fips_allowed = 1,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               },
+                               .dec = {
+                                       .vecs = NULL,
+                                       .count = 0
+                               }
+                       }
+               }
        }, {
                .alg = "cryptd(__driver-ecb-cast5-avx)",
                .test = alg_test_null,
@@ -2335,6 +2397,36 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "ctr(des)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = des_ctr_enc_tv_template,
+                                       .count = DES_CTR_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = des_ctr_dec_tv_template,
+                                       .count = DES_CTR_DEC_TEST_VECTORS
+                               }
+                       }
+               }
+       }, {
+               .alg = "ctr(des3_ede)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = des3_ede_ctr_enc_tv_template,
+                                       .count = DES3_EDE_CTR_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = des3_ede_ctr_dec_tv_template,
+                                       .count = DES3_EDE_CTR_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "ctr(serpent)",
                .test = alg_test_skcipher,