d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cryptocheck: Expand the set of sizes tested by -z.

Browse Source 
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
This commit is contained in:
John Baldwin 2021-04-01 15:42:30 -07:00
parent d2e076c37b
commit c86de1dab8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/tools/crypto/cryptocheck.c
View File

@ -228,7 +228,7 @@ static const struct alg {
static bool verbose; static bool verbose;
static int requested_crid; 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 u_int naad_sizes, nsizes;
static void static void
@ -1729,12 +1729,18 @@ main(int ac, char **av)
if (nsizes == 0) { if (nsizes == 0) {
if (testall) { if (testall) {
for (i = 1; i <= 32; i++) { for (i = 1; i <= EALG_MAX_BLOCK_LEN; i++) {
sizes[nsizes] = i; sizes[nsizes] = i;
nsizes++; 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) { while (base_size * 2 < 240 * 1024) {
base_size *= 2; base_size *= 2;
assert(nsizes < nitems(sizes)); assert(nsizes < nitems(sizes));