aboutsummaryrefslogtreecommitdiff
path: root/tools/tools
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-04-01 22:42:30 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2021-04-01 22:49:07 +0000
commitc86de1dab8e65bc9d11501ca51f2e152276cb94e (patch)
tree240b5cc13059b64647fa1a8f05bbfe2403c61060 /tools/tools
parentd2e076c37b0963a8be89684a656c4e1640dc7a3e (diff)
downloadsrc-c86de1dab8e65bc9d11501ca51f2e152276cb94e.tar.gz
src-c86de1dab8e65bc9d11501ca51f2e152276cb94e.zip
cryptocheck: Expand the set of sizes tested by -z.
Test individual sizes up to the max encryption block length as well as a few sizes that include 1 full block and a partial block before doubling the size. Reviewed by: cem, markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D29518
Diffstat (limited to 'tools/tools')
-rw-r--r--tools/tools/crypto/cryptocheck.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/tools/crypto/cryptocheck.c b/tools/tools/crypto/cryptocheck.c
index bd075d24e0f5..502ea04cd661 100644
--- a/tools/tools/crypto/cryptocheck.c
+++ b/tools/tools/crypto/cryptocheck.c
@@ -228,7 +228,7 @@ static const struct alg {
static bool verbose;
static int requested_crid;
-static size_t aad_sizes[48], sizes[128];
+static size_t aad_sizes[48], sizes[EALG_MAX_BLOCK_LEN * 2];
static u_int naad_sizes, nsizes;
static void
@@ -1729,12 +1729,18 @@ main(int ac, char **av)
if (nsizes == 0) {
if (testall) {
- for (i = 1; i <= 32; i++) {
+ for (i = 1; i <= EALG_MAX_BLOCK_LEN; i++) {
sizes[nsizes] = i;
nsizes++;
}
- base_size = 32;
+ for (i = EALG_MAX_BLOCK_LEN + 8;
+ i <= EALG_MAX_BLOCK_LEN * 2; i += 8) {
+ sizes[nsizes] = i;
+ nsizes++;
+ }
+
+ base_size = EALG_MAX_BLOCK_LEN * 2;
while (base_size * 2 < 240 * 1024) {
base_size *= 2;
assert(nsizes < nitems(sizes));