Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

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

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 941d75cd1f7cd918ef2ef1b436854cd9ec7abb03..edf4a0818773483538f09ecfbe246dd96eb9aaf5 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1638,270 +1638,66 @@ static const struct alg_test_desc alg_test_descs[] = {
        {
                .alg = "__cbc-cast5-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__cbc-cast6-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__cbc-serpent-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__cbc-serpent-sse2",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__cbc-twofish-avx",
                .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,
                .fips_allowed = 1,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
+       }, {
+               .alg = "__driver-cbc-camellia-aesni",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-cbc-cast5-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-cbc-cast6-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-cbc-serpent-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-cbc-serpent-sse2",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-cbc-twofish-avx",
                .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,
                .fips_allowed = 1,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
+       }, {
+               .alg = "__driver-ecb-camellia-aesni",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-ecb-cast5-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-ecb-cast6-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-ecb-serpent-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-ecb-serpent-sse2",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__driver-ecb-twofish-avx",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "__ghash-pclmulqdqni",
                .test = alg_test_null,
                .fips_allowed = 1,
-               .suite = {
-                       .hash = {
-                               .vecs = NULL,
-                               .count = 0
-                       }
-               }
        }, {
                .alg = "ansi_cprng",
                .test = alg_test_cprng,
@@ -2130,135 +1926,39 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "cryptd(__driver-cbc-aes-aesni)",
                .test = alg_test_null,
                .fips_allowed = 1,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
+       }, {
+               .alg = "cryptd(__driver-cbc-camellia-aesni)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-aes-aesni)",
                .test = alg_test_null,
                .fips_allowed = 1,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
+       }, {
+               .alg = "cryptd(__driver-ecb-camellia-aesni)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-cast5-avx)",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "cryptd(__driver-ecb-cast6-avx)",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "cryptd(__driver-ecb-serpent-avx)",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "cryptd(__driver-ecb-serpent-sse2)",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "cryptd(__driver-ecb-twofish-avx)",
                .test = alg_test_null,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "cryptd(__driver-gcm-aes-aesni)",
                .test = alg_test_null,
                .fips_allowed = 1,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "cryptd(__ghash-pclmulqdqni)",
                .test = alg_test_null,
                .fips_allowed = 1,
-               .suite = {
-                       .hash = {
-                               .vecs = NULL,
-                               .count = 0
-                       }
-               }
        }, {
                .alg = "ctr(aes)",
                .test = alg_test_skcipher,
@@ -2335,6 +2035,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,
@@ -2383,6 +2113,7 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "deflate",
                .test = alg_test_comp,
+               .fips_allowed = 1,
                .suite = {
                        .comp = {
                                .comp = {
@@ -2399,18 +2130,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "ecb(__aes-aesni)",
                .test = alg_test_null,
                .fips_allowed = 1,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               },
-                               .dec = {
-                                       .vecs = NULL,
-                                       .count = 0
-                               }
-                       }
-               }
        }, {
                .alg = "ecb(aes)",
                .test = alg_test_skcipher,
@@ -2859,6 +2578,7 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "lzo",
                .test = alg_test_comp,
+               .fips_allowed = 1,
                .suite = {
                        .comp = {
                                .comp = {
@@ -3226,6 +2946,7 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "zlib",
                .test = alg_test_pcomp,
+               .fips_allowed = 1,
                .suite = {
                        .pcomp = {
                                .comp = {