1 files changed, 93 insertions, 2 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index efd8b20e13dc..5823735cf381 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1645,19 +1645,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,
         }, {
@@ -1667,19 +1679,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,
         }, {
@@ -1689,12 +1713,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,
                 .fips_allowed = 1,
@@ -1913,6 +1943,27 @@ 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,
+        }, {
                 .alg = "crc32c",
                 .test = alg_test_crc32c,
                 .fips_allowed = 1,
@@ -1927,16 +1978,31 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .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,
         }, {
@@ -1946,12 +2012,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,
                 .fips_allowed = 1,
@@ -2127,6 +2199,9 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "digest_null",
+                .test = alg_test_null,
+        }, {
                 .alg = "ecb(__aes-aesni)",
                 .test = alg_test_null,
                 .fips_allowed = 1,
@@ -2237,6 +2312,9 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "ecb(cipher_null)",
+                .test = alg_test_null,
+        }, {
                 .alg = "ecb(des)",
                 .test = alg_test_skcipher,
                 .fips_allowed = 1,
@@ -2696,8 +2774,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
-
-
                 .alg = "rfc4309(ccm(aes))",
                 .test = alg_test_aead,
                 .fips_allowed = 1,
@@ -2714,6 +2790,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "rfc4543(gcm(aes))",
+                .test = alg_test_aead,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs = aes_gcm_rfc4543_enc_tv_template,
+                                        .count = AES_GCM_4543_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = aes_gcm_rfc4543_dec_tv_template,
+                                        .count = AES_GCM_4543_DEC_TEST_VECTORS
+                                },
+                        }
+                }
+        }, {
                 .alg = "rmd128",
                 .test = alg_test_hash,
                 .suite = {