From 34ecd7a8e1f3a0485cc9f1cfd9cdf0bcd92a1043 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 25 Mar 2016 18:03:20 +0100 Subject: [PATCH 185/257] geli(8): Dump negative iterations values properly An iterations value of -1 signals that no passphrase is being used. Previously it was dumped incorrectly due to being cast to unsigned first: [fk@elektrobier ~]$ geli dump /dev/ada3p3 Metadata on /dev/ada3p3: magic: GEOM::ELI version: 7 flags: 0x2 ealgo: AES-XTS keylen: 256 provsize: 8589934592 sectorsize: 4096 keys: 0x01 iterations: 4294967295 Salt: [...] Master Key: [...] MD5 hash: 44e17ea9c25f27dff32179bc4f82f659 Obtained from: ElectroBSD --- sys/geom/eli/g_eli.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/eli/g_eli.h b/sys/geom/eli/g_eli.h index 13e780762549..680f67332dd3 100644 --- a/sys/geom/eli/g_eli.h +++ b/sys/geom/eli/g_eli.h @@ -499,7 +499,7 @@ eli_metadata_dump(const struct g_eli_metadata *md) printf(" provsize: %ju\n", (uintmax_t)md->md_provsize); printf("sectorsize: %u\n", (u_int)md->md_sectorsize); printf(" keys: 0x%02x\n", (u_int)md->md_keys); - printf("iterations: %u\n", (u_int)md->md_iterations); + printf("iterations: %i\n", md->md_iterations); bzero(str, sizeof(str)); for (i = 0; i < sizeof(md->md_salt); i++) { str[i * 2] = hex[md->md_salt[i] >> 4]; -- 2.11.0