dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-28 06:33:36 +02:00
Code Releases Activity

Drop the ima_measurement "--verify" option

Browse Source 
While walking the IMA measurement list re-calculating the PCRS,
ima_measurement should always re-calculate the template data digest
and verify it against the measurement list value.

This patch removes the "--verify" option.

On success, return 0.

Suggested-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Mimi Zohar 2020-07-29 16:34:37 -04:00
parent 8e2738dd44
commit 5b58f47570
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -31,7 +31,7 @@ COMMANDS
ima_sign [--sigfile] [--key key] [--pass password] file ima_sign [--sigfile] [--key key] [--pass password] file
ima_verify file ima_verify file
ima_hash file ima_hash file
ima_measurement [--validate] [--verify] [--verify-sig [--key "key1, key2, ..."]] [--pcrs [hash-algorithm,]file [--pcrs hash-algorithm,file] ...] file ima_measurement [--validate] [--verify-sig [--key "key1, key2, ..."]] [--pcrs [hash-algorithm,]file [--pcrs hash-algorithm,file] ...] file
ima_fix [-t fdsxm] path ima_fix [-t fdsxm] path
sign_hash [--key key] [--pass password] sign_hash [--key key] [--pass password]
hmac [--imahash | --imasig ] file hmac [--imahash | --imasig ] file
@ -61,7 +61,6 @@ OPTIONS
--engine e preload OpenSSL engine e (such as: gost) --engine e preload OpenSSL engine e (such as: gost)
--pcrs file containing TPM pcrs, one per hash-algorithm/bank --pcrs file containing TPM pcrs, one per hash-algorithm/bank
--validate ignore ToMToU measurement violations --validate ignore ToMToU measurement violations
--verify verify the template data digest
--verify-sig verify the file signature based on the file hash, both --verify-sig verify the file signature based on the file hash, both
stored in the template data. stored in the template data.
-v increase verbosity level -v increase verbosity level

19
src/evmctl.c
View File

@ -1393,7 +1393,6 @@ struct template_entry {
static uint8_t zero[MAX_DIGEST_SIZE]; static uint8_t zero[MAX_DIGEST_SIZE];
static int validate = 0; static int validate = 0;
static int verify = 0;
static int ima_verify_template_hash(struct template_entry *entry) static int ima_verify_template_hash(struct template_entry *entry)
{ {
@ -1945,7 +1944,7 @@ static int ima_measurement(const char *file)
struct template_entry entry = { .template = 0 }; struct template_entry entry = { .template = 0 };
FILE *fp; FILE *fp;
int verified_template_digest = 0; int invalid_template_digest = 0;
int err_padded = -1; int err_padded = -1;
int err = -1; int err = -1;
@ -2075,11 +2074,9 @@ static int ima_measurement(const char *file)
pseudo_padded_banks); pseudo_padded_banks);
/* Recalculate and verify template data digest */ /* Recalculate and verify template data digest */
if (verify) {
err = ima_verify_template_hash(&entry); err = ima_verify_template_hash(&entry);
if (err) if (err)
verified_template_digest = 1; invalid_template_digest = 1;
}
if (is_ima_template) if (is_ima_template)
ima_show(&entry); ima_show(&entry);
@ -2116,7 +2113,7 @@ static int ima_measurement(const char *file)
log_info("Failed to match per TPM bank or SHA1 padded TPM digest(s).\n"); log_info("Failed to match per TPM bank or SHA1 padded TPM digest(s).\n");
} }
if (verified_template_digest) { if (invalid_template_digest) {
log_info("Failed to verify template data digest.\n"); log_info("Failed to verify template data digest.\n");
err = 1; err = 1;
} }
@ -2486,7 +2483,7 @@ struct command cmds[] = {
{"ima_verify", cmd_verify_ima, 0, "file", "Verify IMA signature (for debugging).\n"}, {"ima_verify", cmd_verify_ima, 0, "file", "Verify IMA signature (for debugging).\n"},
{"ima_setxattr", cmd_setxattr_ima, 0, "[--sigfile file]", "Set IMA signature from sigfile\n"}, {"ima_setxattr", cmd_setxattr_ima, 0, "[--sigfile file]", "Set IMA signature from sigfile\n"},
{"ima_hash", cmd_hash_ima, 0, "file", "Make file content hash.\n"}, {"ima_hash", cmd_hash_ima, 0, "file", "Make file content hash.\n"},
{"ima_measurement", cmd_ima_measurement, 0, "[--validate] [--verify] [--verify-sig [--key key1, key2, ...]] [--pcrs [hash-algorithm,]file [--pcrs hash-algorithm,file] ...] file", "Verify measurement list (experimental).\n"}, {"ima_measurement", cmd_ima_measurement, 0, "[--validate] [--verify-sig [--key key1, key2, ...]] [--pcrs [hash-algorithm,]file [--pcrs hash-algorithm,file] ...] file", "Verify measurement list (experimental).\n"},
{"ima_boot_aggregate", cmd_ima_bootaggr, 0, "[file]", "Calculate per TPM bank boot_aggregate digests\n"}, {"ima_boot_aggregate", cmd_ima_bootaggr, 0, "[file]", "Calculate per TPM bank boot_aggregate digests\n"},
{"ima_fix", cmd_ima_fix, 0, "[-t fdsxm] path", "Recursively fix IMA/EVM xattrs in fix mode.\n"}, {"ima_fix", cmd_ima_fix, 0, "[-t fdsxm] path", "Recursively fix IMA/EVM xattrs in fix mode.\n"},
{"ima_clear", cmd_ima_clear, 0, "[-t fdsxm] path", "Recursively remove IMA/EVM xattrs.\n"}, {"ima_clear", cmd_ima_clear, 0, "[-t fdsxm] path", "Recursively remove IMA/EVM xattrs.\n"},
@ -2526,8 +2523,7 @@ static struct option opts[] = {
{"engine", 1, 0, 139}, {"engine", 1, 0, 139},
{"xattr-user", 0, 0, 140}, {"xattr-user", 0, 0, 140},
{"validate", 0, 0, 141}, {"validate", 0, 0, 141},
{"verify", 0, 0, 142}, {"pcrs", 1, 0, 142},
{"pcrs", 1, 0, 143},
{} {}
}; };
@ -2709,10 +2705,7 @@ int main(int argc, char *argv[])
case 141: /* --validate */ case 141: /* --validate */
validate = 1; validate = 1;
break; break;
case 142: /* --verify */ case 142:
verify = 1;
break;
case 143:
if (npcrfile >= MAX_PCRFILE) { if (npcrfile >= MAX_PCRFILE) {
log_err("too many --pcrfile options\n"); log_err("too many --pcrfile options\n");
exit(1); exit(1);