Update to match latest kernel changes
- Root hash is now stored in authenticated extensions
- Magic number is now at the very end of the file too
- 'set_measurement' is replaced with 'measure'
- UAPI header now declares on-disk format
- log_tree_blocksize is stored instead of log_arity
- CRC-32 is changed to CRC-32C
- SHA-512 is now supported too
Signed-off-by: Eric Biggers <ebiggers@google.com>
diff --git a/fsverity.c b/fsverity.c
index 1df3d77..db8966e 100644
--- a/fsverity.c
+++ b/fsverity.c
@@ -27,6 +27,13 @@
.usage_str =
" fsverity enable FILE\n"
}, {
+ .name = "measure",
+ .func = fsverity_cmd_measure,
+ .short_desc =
+"Display the measurement of the given fs-verity file(s)",
+ .usage_str =
+" fsverity measure FILE...\n"
+ }, {
.name = "setup",
.func = fsverity_cmd_setup,
.short_desc = "Create the verity metadata for a file",
@@ -35,14 +42,7 @@
" [--hash=HASH_ALG] [--salt=SALT] [--signing-key=KEYFILE]\n"
" [--signing-cert=CERTFILE] [--signature=SIGFILE]\n"
" [--patch=OFFSET,PATCHFILE] [--elide=OFFSET,LENGTH]\n"
- }, {
- .name = "set_measurement",
- .func = fsverity_cmd_set_measurement,
- .short_desc =
-"Set the trusted file measurement for the given fs-verity file",
- .usage_str =
-" fsverity set_measurement FILE EXPECTED_MEASUREMENT [--hash=HASH_ALG]\n"
- },
+ }
};
static void usage_all(FILE *fp)