This patchset adds wrappers around FS_IOC_ENABLE_VERITY to the library API, and makes the fsverity commands share code to parse the libfsverity_merkle_tree_params. This is my proposed alternative to Luca's patch https://lkml.kernel.org/linux-fscrypt/20201113143527.1097499-1-luca.boccassi@xxxxxxxxx Eric Biggers (2): lib: add libfsverity_enable() and libfsverity_enable_with_sig() programs/fsverity: share code to parse tree parameters include/libfsverity.h | 36 ++++++++++++++++++++++++++++++++++ lib/enable.c | 45 +++++++++++++++++++++++++++++++++++++++++++ programs/cmd_digest.c | 31 ++++------------------------- programs/cmd_enable.c | 34 ++++++++------------------------ programs/cmd_sign.c | 31 ++++------------------------- programs/fsverity.c | 42 ++++++++++++++++++++++++++++++++++++---- programs/fsverity.h | 19 ++++++++++++++---- 7 files changed, 150 insertions(+), 88 deletions(-) create mode 100644 lib/enable.c -- 2.29.2
|