-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-crypt/tpm2-tools: Fix eventlog test
Closes: https://bugs.gentoo.org/930008 Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
- Loading branch information
1 parent
fe4cdec
commit 737cdae
Showing
2 changed files
with
69 additions
and
0 deletions.
There are no files selected for viewing
68 changes: 68 additions & 0 deletions
68
app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
From 4dec5295361d753c3466bc9e8b0ae3a3cc58dff5 Mon Sep 17 00:00:00 2001 | ||
From: Juergen Repp <juergen_repp@web.de> | ||
Date: Thu, 4 Apr 2024 09:42:51 +0200 | ||
Subject: [PATCH] test eventlog.sh Fix accidental deletions. | ||
|
||
* Accidental deletions made in commit 196e3d439407e81040ced054a8ed302489348a9d | ||
are undone. | ||
* python3 is used as default instead of python. | ||
|
||
Signed-off-by: Juergen Repp <juergen_repp@web.de> | ||
--- | ||
test/integration/tests/eventlog.sh | 33 ++++++++++++++++++++++++++++-- | ||
1 file changed, 31 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/test/integration/tests/eventlog.sh b/test/integration/tests/eventlog.sh | ||
index 9d5290f0..e7c13706 100755 | ||
--- a/test/integration/tests/eventlog.sh | ||
+++ b/test/integration/tests/eventlog.sh | ||
@@ -3,7 +3,7 @@ | ||
set -E | ||
shopt -s expand_aliases | ||
|
||
-alias python=${PYTHON-python} | ||
+alias python=${PYTHON-python3} | ||
|
||
yaml_validate() { | ||
cmd=$1 | ||
@@ -88,7 +88,36 @@ expect_pass() { | ||
expect_fail | ||
expect_fail foo | ||
expect_fail foo bar | ||
-expect_fail ${srcdir}/test/integration/fix | ||
+expect_fail ${srcdir}/test/integration/fixtures/event-bad.bin | ||
+ | ||
+expect_pass ${srcdir}/test/integration/fixtures/specid-vendordata.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-uefivar.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-uefiaction.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-uefiservices.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-uefi-sha1-log.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-bootorder.bin | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-postcode.bin | ||
+ | ||
+# Make sure that --eventlog-version=2 works on complete TPM2 logs | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-arch-linux.bin --eventlog-version=2 | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-gce-ubuntu-2104-log.bin --eventlog-version=2 | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-sd-boot-fedora37.bin --eventlog-version=2 | ||
+expect_pass ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin --eventlog-version=2 | ||
+ | ||
+# Pick an event with leading whitespace and validate we have | ||
+# preserved it correctly after parsing the YAML | ||
+event=$(yaml_validate "print(y['events'][80]['Event']['String'])" < ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml | tr -d '\0') | ||
+expect=$(echo -e "grub_cmd: menuentry UEFI Firmware Settings --id uefi-firmware {\n\t\tfwsetup\n\t}") | ||
+if test "$event" != "$expect" | ||
+then | ||
+ echo "Got $event" | ||
+ echo "Want $expect" | ||
+ exit 1 | ||
+fi | ||
+ | ||
+# Compare strings generated by tpm2_eventlog with binary data of the corresponding | ||
+# events. | ||
hex_file="${srcdir}/test/integration/fixtures/event-moklisttrusted-hex.yaml" | ||
tool_file="${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml" | ||
|
||
-- | ||
2.43.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters