1 files changed, 203 insertions, 0 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 5674878ff6c1..a2ca7431760a 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1534,6 +1534,21 @@ static int alg_test_null(const struct alg_test_desc *desc,
 /* Please keep this list sorted by algorithm name. */
 static const struct alg_test_desc alg_test_descs[] = {
         {
+                .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 = {
@@ -1549,8 +1564,39 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .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-serpent-avx",
+                .test = alg_test_null,
                 .suite = {
                         .cipher = {
                                 .enc = {
@@ -1579,8 +1625,39 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .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-serpent-avx",
+                .test = alg_test_null,
                 .suite = {
                         .cipher = {
                                 .enc = {
@@ -1609,8 +1686,24 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .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,
@@ -1628,6 +1721,42 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "authenc(hmac(sha1),cbc(aes))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs = hmac_sha1_aes_cbc_enc_tv_template,
+                                        .count = HMAC_SHA1_AES_CBC_ENC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha256),cbc(aes))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs = hmac_sha256_aes_cbc_enc_tv_template,
+                                        .count = HMAC_SHA256_AES_CBC_ENC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha512),cbc(aes))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs = hmac_sha512_aes_cbc_enc_tv_template,
+                                        .count = HMAC_SHA512_AES_CBC_ENC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "cbc(aes)",
                 .test = alg_test_skcipher,
                 .fips_allowed = 1,
@@ -1776,8 +1905,40 @@ 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-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-serpent-avx)",
+                .test = alg_test_null,
                 .suite = {
                         .cipher = {
                                 .enc = {
@@ -1806,8 +1967,40 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .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,
@@ -1923,6 +2116,7 @@ static const struct alg_test_desc alg_test_descs[] = {
         }, {
                 .alg = "ecb(__aes-aesni)",
                 .test = alg_test_null,
+                .fips_allowed = 1,
                 .suite = {
                         .cipher = {
                                 .enc = {
@@ -2220,6 +2414,15 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "hmac(crc32)",
+                .test = alg_test_hash,
+                .suite = {
+                        .hash = {
+                                .vecs = bfin_crc_tv_template,
+                                .count = BFIN_CRC_TEST_VECTORS
+                        }
+                }
+        }, {
                 .alg = "hmac(md5)",
                 .test = alg_test_hash,
                 .suite = {