From: Petr Vorel <pvorel@suse.cz>
To: ltp@lists.linux.it
Cc: Petr Vorel <pvorel@suse.cz>,
Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
linux-integrity@vger.kernel.org
Subject: [PATCH v2 0/4] TPM 2.0 fixes in IMA tests
Date: Fri, 25 Sep 2020 20:50:30 +0200 [thread overview]
Message-ID: <20200925185034.24155-1-pvorel@suse.cz> (raw)
Hi,
v2 to fix bugs related to legacy ima_boot_aggregate:
* exit with TPASS to keep API happy
* add missing ! in algorithm condition
* missing -f $tpm_bios parameter
* reintroduce check for ima_boot_aggregate presence
Sorry for the noise
Kind regards,
Petr
diff --git testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
index 318d9c299..67f97ea04 100644
--- testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
+++ testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
@@ -117,8 +117,9 @@ static void do_test(void)
}
SHA1_Final(boot_aggregate, &c);
- printf("boot_aggregate:");
+ printf("sha1:");
display_sha1_digest(boot_aggregate);
+ tst_res(TPASS, "found sha1 hash");
}
static struct tst_option options[] = {
diff --git testcases/kernel/security/integrity/ima/tests/ima_tpm.sh testcases/kernel/security/integrity/ima/tests/ima_tpm.sh
index 300c96f64..78e81ed64 100755
--- testcases/kernel/security/integrity/ima/tests/ima_tpm.sh
+++ testcases/kernel/security/integrity/ima/tests/ima_tpm.sh
@@ -31,7 +31,7 @@ setup()
if ! check_evmctl $EVMCTL_REQUIRED; then
MISSING_EVMCTL=1
- if [ "$ALGORITHM" = "sha1" ]; then
+ if [ "$ALGORITHM" != "sha1" ]; then
tst_brk TCONF "algorithm not sha1 ($ALGORITHM), $ERRMSG_EVMCTL"
fi
fi
@@ -159,7 +159,8 @@ test1()
tst_res TCONF "missing $tpm_bios, $ERRMSG_EVMCTL"
return
fi
- cmd="ima_boot_aggregate"
+ tst_check_cmds ima_boot_aggregate || return
+ cmd="ima_boot_aggregate -f $tpm_bios"
fi
tst_res TINFO "using command: $cmd"
Petr Vorel (4):
IMA: Move get_algorithm_digest(), set_digest_index() to ima_setup.sh
IMA: Rewrite ima_boot_aggregate.c to new API
ima_tpm.sh: Fix calculating boot aggregate
ima_tpm.sh: Fix calculating PCR aggregate
.../integrity/ima/src/ima_boot_aggregate.c | 113 ++++-----
.../integrity/ima/tests/ima_measurements.sh | 62 +----
.../security/integrity/ima/tests/ima_setup.sh | 70 +++++
.../security/integrity/ima/tests/ima_tpm.sh | 239 +++++++++++++-----
4 files changed, 314 insertions(+), 170 deletions(-)
--
2.28.0
next reply other threads:[~2020-09-25 18:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 18:50 Petr Vorel [this message]
2020-09-25 18:50 ` [PATCH v2 1/4] IMA: Move get_algorithm_digest(), set_digest_index() to ima_setup.sh Petr Vorel
2020-09-25 18:50 ` [PATCH v2 2/4] IMA: Rewrite ima_boot_aggregate.c to new API Petr Vorel
2020-09-25 18:50 ` [PATCH v2 3/4] ima_tpm.sh: Fix calculating boot aggregate Petr Vorel
2020-09-29 12:17 ` Petr Vorel
2020-09-29 12:33 ` Mimi Zohar
2020-09-30 6:57 ` Petr Vorel
2020-09-25 18:50 ` [PATCH v2 4/4] ima_tpm.sh: Fix calculating PCR aggregate Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200925185034.24155-1-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-integrity@vger.kernel.org \
--cc=ltp@lists.linux.it \
--cc=nramas@linux.microsoft.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox