crypto: testmgr - stop checking crypto_ahash_alignmask

[thirdparty/kernel/linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 216878c8bc3d62f8abd6e708acffffae7d09e5df..335449a27f7575e4b88b04009ddaaa3a6839e31f 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -408,17 +408,15 @@ static const struct testvec_config default_hash_testvec_configs[] = {
                .finalization_type = FINALIZATION_TYPE_FINAL,
                .key_offset = 1,
        }, {
-               .name = "digest buffer aligned only to alignmask",
+               .name = "digest misaligned buffer",
                .src_divs = {
                        {
                                .proportion_of_total = 10000,
                                .offset = 1,
-                               .offset_relative_to_alignmask = true,
                        },
                },
                .finalization_type = FINALIZATION_TYPE_DIGEST,
                .key_offset = 1,
-               .key_offset_relative_to_alignmask = true,
        }, {
                .name = "init+update+update+final two even splits",
                .src_divs = {
@@ -1275,7 +1273,6 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
                              u8 *hashstate)
 {
        struct crypto_shash *tfm = desc->tfm;
-       const unsigned int alignmask = crypto_shash_alignmask(tfm);
        const unsigned int digestsize = crypto_shash_digestsize(tfm);
        const unsigned int statesize = crypto_shash_statesize(tfm);
        const char *driver = crypto_shash_driver_name(tfm);
@@ -1287,7 +1284,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
        /* Set the key, if specified */
        if (vec->ksize) {
                err = do_setkey(crypto_shash_setkey, tfm, vec->key, vec->ksize,
-                               cfg, alignmask);
+                               cfg, 0);
                if (err) {
                        if (err == vec->setkey_error)
                                return 0;
@@ -1304,7 +1301,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
        }
 
        /* Build the scatterlist for the source data */
-       err = build_hash_sglist(tsgl, vec, cfg, alignmask, divs);
+       err = build_hash_sglist(tsgl, vec, cfg, 0, divs);
        if (err) {
                pr_err("alg: shash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n",
                       driver, vec_name, cfg->name);
@@ -1459,7 +1456,6 @@ static int test_ahash_vec_cfg(const struct hash_testvec *vec,
                              u8 *hashstate)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
-       const unsigned int alignmask = crypto_ahash_alignmask(tfm);
        const unsigned int digestsize = crypto_ahash_digestsize(tfm);
        const unsigned int statesize = crypto_ahash_statesize(tfm);
        const char *driver = crypto_ahash_driver_name(tfm);
@@ -1475,7 +1471,7 @@ static int test_ahash_vec_cfg(const struct hash_testvec *vec,
        /* Set the key, if specified */
        if (vec->ksize) {
                err = do_setkey(crypto_ahash_setkey, tfm, vec->key, vec->ksize,
-                               cfg, alignmask);
+                               cfg, 0);
                if (err) {
                        if (err == vec->setkey_error)
                                return 0;
@@ -1492,7 +1488,7 @@ static int test_ahash_vec_cfg(const struct hash_testvec *vec,
        }
 
        /* Build the scatterlist for the source data */
-       err = build_hash_sglist(tsgl, vec, cfg, alignmask, divs);
+       err = build_hash_sglist(tsgl, vec, cfg, 0, divs);
        if (err) {
                pr_err("alg: ahash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n",
                       driver, vec_name, cfg->name);
@@ -4963,7 +4959,7 @@ static const struct alg_test_desc alg_test_descs[] = {
                }
        }, {
                .alg = "ecb(arc4)",
-               .generic_driver = "ecb(arc4)-generic",
+               .generic_driver = "arc4-generic",
                .test = alg_test_skcipher,
                .suite = {
                        .cipher = __VECS(arc4_tv_template)
@@ -5772,16 +5768,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                .suite = {
                        .hash = __VECS(xxhash64_tv_template)
                }
-       }, {
-               .alg = "zlib-deflate",
-               .test = alg_test_comp,
-               .fips_allowed = 1,
-               .suite = {
-                       .comp = {
-                               .comp = __VECS(zlib_deflate_comp_tv_template),
-                               .decomp = __VECS(zlib_deflate_decomp_tv_template)
-                       }
-               }
        }, {
                .alg = "zstd",
                .test = alg_test_comp,
@@ -5945,6 +5931,25 @@ test_done:
        return rc;
 
 notest:
+       if ((type & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_LSKCIPHER) {
+               char nalg[CRYPTO_MAX_ALG_NAME];
+
+               if (snprintf(nalg, sizeof(nalg), "ecb(%s)", alg) >=
+                   sizeof(nalg))
+                       goto notest2;
+
+               i = alg_find_test(nalg);
+               if (i < 0)
+                       goto notest2;
+
+               if (fips_enabled && !alg_test_descs[i].fips_allowed)
+                       goto non_fips_alg;
+
+               rc = alg_test_skcipher(alg_test_descs + i, driver, type, mask);
+               goto test_done;
+       }
+
+notest2:
        printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);
 
        if (type & CRYPTO_ALG_FIPS_INTERNAL)