aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Berger <stefanb@linux.vnet.ibm.com>2020-07-07 16:16:25 -0400
committerStefan Berger <stefanb@linux.vnet.ibm.com>2020-07-15 14:57:33 -0400
commitdf8a7568932e4c3c930fdfeb228dd72b4bb71a1f (patch)
tree5a9d026a83eec81899f3328e8479040b59b62e19
parentf8b332a1ff107dc014a52eaf9bf547995205f18a (diff)
downloadqemu-df8a7568932e4c3c930fdfeb228dd72b4bb71a1f.zip
qemu-df8a7568932e4c3c930fdfeb228dd72b4bb71a1f.tar.gz
qemu-df8a7568932e4c3c930fdfeb228dd72b4bb71a1f.tar.bz2
tests: tpm: Skip over pcrUpdateCounter byte in result comparison
The TPM 2 code in libtpms was fixed to handle the PCR 'TCB group' according to the PCClient profile. The change of the PCRs belonging to the 'TCB group' now affects the pcrUpdateCounter in the TPM2_PCRRead() responses where its value is now different (typically lower by '1') than what it was before. To not fail the tests, we skip the comparison of the 14th byte, which represents the pcrUpdateCounter. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20200707201625.4177419-3-stefanb@linux.vnet.ibm.com
-rw-r--r--tests/qtest/tpm-util.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index 34efae8..58a9593 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)