Merge tag 'v3.10-rc1' into stable/for-linus-3.10

[linux-2.6-block.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index f37e544dddf0d66a29aa2b967bcbb7b2aa469869..5823735cf381c0e531a3295419d0ea9d9759c837 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1644,19 +1644,31 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "__cbc-serpent-avx",
                .test = alg_test_null,
+       }, {
+               .alg = "__cbc-serpent-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__cbc-serpent-sse2",
                .test = alg_test_null,
        }, {
                .alg = "__cbc-twofish-avx",
                .test = alg_test_null,
+       }, {
+               .alg = "__cbc-twofish-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-cbc-aes-aesni",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "__driver-cbc-blowfish-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-cbc-camellia-aesni",
                .test = alg_test_null,
+       }, {
+               .alg = "__driver-cbc-camellia-aesni-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-cbc-cast5-avx",
                .test = alg_test_null,
@@ -1666,19 +1678,31 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "__driver-cbc-serpent-avx",
                .test = alg_test_null,
+       }, {
+               .alg = "__driver-cbc-serpent-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-cbc-serpent-sse2",
                .test = alg_test_null,
        }, {
                .alg = "__driver-cbc-twofish-avx",
                .test = alg_test_null,
+       }, {
+               .alg = "__driver-cbc-twofish-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-ecb-aes-aesni",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "__driver-ecb-blowfish-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-ecb-camellia-aesni",
                .test = alg_test_null,
+       }, {
+               .alg = "__driver-ecb-camellia-aesni-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-ecb-cast5-avx",
                .test = alg_test_null,
@@ -1688,12 +1712,18 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "__driver-ecb-serpent-avx",
                .test = alg_test_null,
+       }, {
+               .alg = "__driver-ecb-serpent-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__driver-ecb-serpent-sse2",
                .test = alg_test_null,
        }, {
                .alg = "__driver-ecb-twofish-avx",
                .test = alg_test_null,
+       }, {
+               .alg = "__driver-ecb-twofish-avx2",
+               .test = alg_test_null,
        }, {
                .alg = "__ghash-pclmulqdqni",
                .test = alg_test_null,
@@ -1912,6 +1942,24 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "cmac(aes)",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = {
+                               .vecs = aes_cmac128_tv_template,
+                               .count = CMAC_AES_TEST_VECTORS
+                       }
+               }
+       }, {
+               .alg = "cmac(des3_ede)",
+               .test = alg_test_hash,
+               .suite = {
+                       .hash = {
+                               .vecs = des3_ede_cmac64_tv_template,
+                               .count = CMAC_DES3_EDE_TEST_VECTORS
+                       }
+               }
        }, {
                .alg = "compress_null",
                .test = alg_test_null,
@@ -1929,16 +1977,31 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "cryptd(__driver-cbc-aes-aesni)",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "cryptd(__driver-cbc-blowfish-avx2)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-cbc-camellia-aesni)",
                .test = alg_test_null,
+       }, {
+               .alg = "cryptd(__driver-cbc-camellia-aesni-avx2)",
+               .test = alg_test_null,
+       }, {
+               .alg = "cryptd(__driver-cbc-serpent-avx2)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-aes-aesni)",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "cryptd(__driver-ecb-blowfish-avx2)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-camellia-aesni)",
                .test = alg_test_null,
+       }, {
+               .alg = "cryptd(__driver-ecb-camellia-aesni-avx2)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-cast5-avx)",
                .test = alg_test_null,
@@ -1948,12 +2011,18 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "cryptd(__driver-ecb-serpent-avx)",
                .test = alg_test_null,
+       }, {
+               .alg = "cryptd(__driver-ecb-serpent-avx2)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-serpent-sse2)",
                .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-ecb-twofish-avx)",
                .test = alg_test_null,
+       }, {
+               .alg = "cryptd(__driver-ecb-twofish-avx2)",
+               .test = alg_test_null,
        }, {
                .alg = "cryptd(__driver-gcm-aes-aesni)",
                .test = alg_test_null,