From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: qemu-ppc@nongnu.org, marcandre.lureau@redhat.com
Cc: Stefan Berger <stefanb@linux.ibm.com>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
qemu-devel@nongnu.org, david@gibson.dropbear.id.au
Subject: [PATCH v2 2/2] tests: Skip over pcrUpdateCounter byte in result comparison
Date: Tue, 7 Jul 2020 00:05:22 -0400 [thread overview]
Message-ID: <20200707040522.4013885-3-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200707040522.4013885-1-stefanb@linux.vnet.ibm.com>
Due to a change in the TPM 2 code the pcrUpdate counter in the
PCRRead response is now different, so we skip comparison of the
14th byte.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
tests/qtest/tpm-util.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index 34efae8f18..58a9593745 100644
--- a/tests/qtest/tpm-util.c
+++ b/tests/qtest/tpm-util.c
@@ -139,7 +139,11 @@ void tpm_util_pcrread(QTestState *s, tx_func *tx,
tx(s, tpm_pcrread, sizeof(tpm_pcrread), buffer, sizeof(buffer));
- g_assert_cmpmem(buffer, exp_resp_size, exp_resp, exp_resp_size);
+ /* skip pcrUpdateCounter (14th byte) in comparison */
+ g_assert(exp_resp_size >= 15);
+ g_assert_cmpmem(buffer, 13, exp_resp, 13);
+ g_assert_cmpmem(&buffer[14], exp_resp_size - 14,
+ &exp_resp[14], exp_resp_size - 14);
}
bool tpm_util_swtpm_has_tpm2(void)
--
2.24.1
next prev parent reply other threads:[~2020-07-07 4:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 4:05 [PATCH v2 0/2] tpm: Some fixes Stefan Berger
2020-07-07 4:05 ` [PATCH v2 1/2] tpm: tpm_spapr: Exit on TPM backend failures Stefan Berger
2020-07-07 4:20 ` Philippe Mathieu-Daudé
2020-07-07 8:19 ` David Gibson
2020-07-07 12:52 ` Stefan Berger
2020-07-07 13:24 ` Philippe Mathieu-Daudé
2020-07-07 4:05 ` Stefan Berger [this message]
2020-07-07 8:19 ` [PATCH v2 2/2] tests: Skip over pcrUpdateCounter byte in result comparison David Gibson
2020-07-07 17:43 ` Stefan Berger
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=20200707040522.4013885-3-stefanb@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=david@gibson.dropbear.id.au \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=stefanb@linux.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;
as well as URLs for NNTP newsgroup(s).