From: Eric Biggers <ebiggers@xxxxxxxxxx>
Update the shash self-tests to test the new finup2x method when
CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y.
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
---
crypto/testmgr.c | 53 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 44 insertions(+), 9 deletions(-)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 2200d70e2aa9d..e6d42db6f344e 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -227,10 +227,12 @@ enum flush_type {
/* finalization function for hash algorithms */
enum finalization_type {
FINALIZATION_TYPE_FINAL, /* use final() */
FINALIZATION_TYPE_FINUP, /* use finup() */
+ FINALIZATION_TYPE_FINUP2X_BUF1, /* use 1st buffer of finup2x() */
+ FINALIZATION_TYPE_FINUP2X_BUF2, /* use 2nd buffer of finup2x() */
FINALIZATION_TYPE_DIGEST, /* use digest() */
};
/*
* Whether the crypto operation will occur in-place, and if so whether the
@@ -1105,19 +1107,27 @@ static void generate_random_testvec_config(struct rnd_state *rng,
if (prandom_bool(rng)) {
cfg->req_flags |= CRYPTO_TFM_REQ_MAY_SLEEP;
p += scnprintf(p, end - p, " may_sleep");
}
- switch (prandom_u32_below(rng, 4)) {
+ switch (prandom_u32_below(rng, 6)) {
case 0:
cfg->finalization_type = FINALIZATION_TYPE_FINAL;
p += scnprintf(p, end - p, " use_final");
break;
case 1:
cfg->finalization_type = FINALIZATION_TYPE_FINUP;
p += scnprintf(p, end - p, " use_finup");
break;
+ case 2:
+ cfg->finalization_type = FINALIZATION_TYPE_FINUP2X_BUF1;
+ p += scnprintf(p, end - p, " use_finup2x_buf1");
+ break;
+ case 3:
+ cfg->finalization_type = FINALIZATION_TYPE_FINUP2X_BUF2;
+ p += scnprintf(p, end - p, " use_finup2x_buf2");
+ break;
default:
cfg->finalization_type = FINALIZATION_TYPE_DIGEST;
p += scnprintf(p, end - p, " use_digest");
break;
}
@@ -1342,11 +1352,14 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
return -EINVAL;
}
goto result_ready;
}
- /* Using init(), zero or more update(), then final() or finup() */
+ /*
+ * Using init(), zero or more update(), then either final(), finup(), or
+ * finup2x().
+ */
if (cfg->nosimd)
crypto_disable_simd_for_test();
err = crypto_shash_init(desc);
if (cfg->nosimd)
@@ -1354,28 +1367,50 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
err = check_shash_op("init", err, driver, vec_name, cfg);
if (err)
return err;
for (i = 0; i < tsgl->nents; i++) {
+ const u8 *data = sg_virt(&tsgl->sgl[i]);
+ unsigned int len = tsgl->sgl[i].length;
+
if (i + 1 == tsgl->nents &&
- cfg->finalization_type == FINALIZATION_TYPE_FINUP) {
+ (cfg->finalization_type == FINALIZATION_TYPE_FINUP ||
+ cfg->finalization_type == FINALIZATION_TYPE_FINUP2X_BUF1 ||
+ cfg->finalization_type == FINALIZATION_TYPE_FINUP2X_BUF2)) {
+ const u8 *unused_data = tsgl->bufs[XBUFSIZE - 1];
+ u8 unused_result[HASH_MAX_DIGESTSIZE];
+ const char *op;
+
if (divs[i]->nosimd)
crypto_disable_simd_for_test();
- err = crypto_shash_finup(desc, sg_virt(&tsgl->sgl[i]),
- tsgl->sgl[i].length, result);
+ if (cfg->finalization_type == FINALIZATION_TYPE_FINUP ||
+ !crypto_shash_supports_finup2x(tfm)) {
+ err = crypto_shash_finup(desc, data, len,
+ result);
+ op = "finup";
+ } else if (cfg->finalization_type ==
+ FINALIZATION_TYPE_FINUP2X_BUF1) {
+ err = crypto_shash_finup2x(
+ desc, data, unused_data, len,
+ result, unused_result);
+ op = "finup2x_buf1";
+ } else { /* FINALIZATION_TYPE_FINUP2X_BUF2 */
+ err = crypto_shash_finup2x(
+ desc, unused_data, data, len,
+ unused_result, result);
+ op = "finup2x_buf2";
+ }
if (divs[i]->nosimd)
crypto_reenable_simd_for_test();
- err = check_shash_op("finup", err, driver, vec_name,
- cfg);
+ err = check_shash_op(op, err, driver, vec_name, cfg);
if (err)
return err;
goto result_ready;
}
if (divs[i]->nosimd)
crypto_disable_simd_for_test();
- err = crypto_shash_update(desc, sg_virt(&tsgl->sgl[i]),
- tsgl->sgl[i].length);
+ err = crypto_shash_update(desc, data, len);
if (divs[i]->nosimd)
crypto_reenable_simd_for_test();
err = check_shash_op("update", err, driver, vec_name, cfg);
if (err)
return err;
--
2.44.0
