Merge branch 'sh/genirq-threading' into sh-latest

[firefly-linux-kernel-4.4.55.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 27ea9fe9476fb96aff90d7df5d13c1e4c21640c5..b6b93d41635149692f473d19fdc53118d4de29fe 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2077,6 +2077,7 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "ghash",
                .test = alg_test_hash,
+               .fips_allowed = 1,
                .suite = {
                        .hash = {
                                .vecs = ghash_tv_template,
@@ -2217,6 +2218,22 @@ static const struct alg_test_desc alg_test_descs[] = {
                                .count = MICHAEL_MIC_TEST_VECTORS
                        }
                }
+       }, {
+               .alg = "ofb(aes)",
+               .test = alg_test_skcipher,
+               .fips_allowed = 1,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = aes_ofb_enc_tv_template,
+                                       .count = AES_OFB_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = aes_ofb_dec_tv_template,
+                                       .count = AES_OFB_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "pcbc(fcrypt)",
                .test = alg_test_skcipher,
@@ -2453,6 +2470,7 @@ static const struct alg_test_desc alg_test_descs[] = {
        }, {
                .alg = "xts(aes)",
                .test = alg_test_skcipher,
+               .fips_allowed = 1,
                .suite = {
                        .cipher = {
                                .enc = {