From 6ecb88352886f37639c3d11ae7743bb090c4c9a4 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Fri, 16 Jul 2021 15:33:00 -0400 Subject: [PATCH] evmctl: Remove left-over check S_ISDIR() for directory signing Since we are not signing directory entries, remove the left-over check with S_ISDIR(). Suggested-by: Mimi Zohar Signed-off-by: Stefan Berger Signed-off-by: Mimi Zohar --- src/evmctl.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/evmctl.c b/src/evmctl.c index 23be73d..4c62325 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -362,9 +362,7 @@ static int calc_evm_hash(const char *file, unsigned char *hash) st.st_mode = strtoul(mode_str, NULL, 10); if (!evm_immutable) { - if ((S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) && !generation_str) { - /* we cannot at the momement to get generation of - special files kernel API does not support it */ + if (S_ISREG(st.st_mode) && !generation_str) { int fd = open(file, 0); if (fd < 0) { @@ -1116,9 +1114,7 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h goto out; } - if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) { - /* we cannot at the momement to get generation of special files.. - * kernel API does not support it */ + if (S_ISREG(st.st_mode)) { int fd = open(file, 0); if (fd < 0) {