]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
crypto: testmgr - stop checking crypto_ahash_alignmask
authorEric Biggers <ebiggers@google.com>
Sun, 22 Oct 2023 08:10:47 +0000 (01:10 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 27 Oct 2023 10:04:29 +0000 (18:04 +0800)
Now that the alignmask for ahash and shash algorithms is always 0,
crypto_ahash_alignmask() always returns 0 and will be removed.  In
preparation for this, stop checking crypto_ahash_alignmask() in testmgr.

As a result of this change,
test_sg_division::offset_relative_to_alignmask and
testvec_config::key_offset_relative_to_alignmask no longer have any
effect on ahash (or shash) algorithms.  Therefore, also stop setting
these flags in default_hash_testvec_configs[].

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/testmgr.c

index 48a0929c7a158d1ad428b603f4b2b54d7699cb55..335449a27f7575e4b88b04009ddaaa3a6839e31f 100644 (file)
@@ -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 = {
@@ -1458,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);
@@ -1474,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;
@@ -1491,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);