LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: Stefan Berger <stefanb@linux.ibm.com>
Cc: jarkko@kernel.org, linux-integrity@vger.kernel.org,
peterhuewe@gmx.de,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] selftests: tpm: Probe for available PCR bank
Date: Tue, 23 Nov 2021 12:13:21 +0400 [thread overview]
Message-ID: <CAMxuvay+TJ8fs50GoZXUkX5NUsq20+xQBY3W5OSxMMvVGhJNow@mail.gmail.com> (raw)
In-Reply-To: <20211122191752.1308953-2-stefanb@linux.ibm.com>
On Mon, Nov 22, 2021 at 11:18 PM Stefan Berger <stefanb@linux.ibm.com> wrote:
>
> Probe for an available PCR bank to accommodate devices that do not have a
> SHA-1 PCR bank or whose SHA-1 bank is deactivated.
>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Tested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> tools/testing/selftests/tpm2/tpm2_tests.py | 31 ++++++++++++++++------
> 1 file changed, 23 insertions(+), 8 deletions(-)
>
> diff --git a/tools/testing/selftests/tpm2/tpm2_tests.py b/tools/testing/selftests/tpm2/tpm2_tests.py
> index 9d764306887b..a569c8d0db08 100644
> --- a/tools/testing/selftests/tpm2/tpm2_tests.py
> +++ b/tools/testing/selftests/tpm2/tpm2_tests.py
> @@ -27,7 +27,21 @@ class SmokeTest(unittest.TestCase):
> result = self.client.unseal(self.root_key, blob, auth, None)
> self.assertEqual(data, result)
>
> + def determine_bank_alg(self):
> + # Probe for available PCR bank
> + for bank_alg in [tpm2.TPM2_ALG_SHA1, tpm2.TPM2_ALG_SHA256]:
> + try:
> + handle = self.client.start_auth_session(tpm2.TPM2_SE_TRIAL)
> + self.client.policy_pcr(handle, [17], bank_alg=bank_alg)
> + break
> + except tpm2.UnknownPCRBankError:
> + pass
> + finally:
> + self.client.flush_context(handle)
> + return bank_alg
> +
> def test_seal_with_policy(self):
> + bank_alg = self.determine_bank_alg()
> handle = self.client.start_auth_session(tpm2.TPM2_SE_TRIAL)
>
> data = ('X' * 64).encode()
> @@ -35,7 +49,7 @@ class SmokeTest(unittest.TestCase):
> pcrs = [16]
>
> try:
> - self.client.policy_pcr(handle, pcrs)
> + self.client.policy_pcr(handle, pcrs, bank_alg=bank_alg)
> self.client.policy_password(handle)
>
> policy_dig = self.client.get_policy_digest(handle)
> @@ -47,7 +61,7 @@ class SmokeTest(unittest.TestCase):
> handle = self.client.start_auth_session(tpm2.TPM2_SE_POLICY)
>
> try:
> - self.client.policy_pcr(handle, pcrs)
> + self.client.policy_pcr(handle, pcrs, bank_alg=bank_alg)
> self.client.policy_password(handle)
>
> result = self.client.unseal(self.root_key, blob, auth, handle)
> @@ -72,6 +86,7 @@ class SmokeTest(unittest.TestCase):
> self.assertEqual(rc, tpm2.TPM2_RC_AUTH_FAIL)
>
> def test_unseal_with_wrong_policy(self):
> + bank_alg = self.determine_bank_alg()
> handle = self.client.start_auth_session(tpm2.TPM2_SE_TRIAL)
>
> data = ('X' * 64).encode()
> @@ -79,7 +94,7 @@ class SmokeTest(unittest.TestCase):
> pcrs = [16]
>
> try:
> - self.client.policy_pcr(handle, pcrs)
> + self.client.policy_pcr(handle, pcrs, bank_alg=bank_alg)
> self.client.policy_password(handle)
>
> policy_dig = self.client.get_policy_digest(handle)
> @@ -91,13 +106,13 @@ class SmokeTest(unittest.TestCase):
> # Extend first a PCR that is not part of the policy and try to unseal.
> # This should succeed.
>
> - ds = tpm2.get_digest_size(tpm2.TPM2_ALG_SHA1)
> - self.client.extend_pcr(1, ('X' * ds).encode())
> + ds = tpm2.get_digest_size(bank_alg)
> + self.client.extend_pcr(1, ('X' * ds).encode(), bank_alg=bank_alg)
>
> handle = self.client.start_auth_session(tpm2.TPM2_SE_POLICY)
>
> try:
> - self.client.policy_pcr(handle, pcrs)
> + self.client.policy_pcr(handle, pcrs, bank_alg=bank_alg)
> self.client.policy_password(handle)
>
> result = self.client.unseal(self.root_key, blob, auth, handle)
> @@ -109,14 +124,14 @@ class SmokeTest(unittest.TestCase):
>
> # Then, extend a PCR that is part of the policy and try to unseal.
> # This should fail.
> - self.client.extend_pcr(16, ('X' * ds).encode())
> + self.client.extend_pcr(16, ('X' * ds).encode(), bank_alg=bank_alg)
>
> handle = self.client.start_auth_session(tpm2.TPM2_SE_POLICY)
>
> rc = 0
>
> try:
> - self.client.policy_pcr(handle, pcrs)
> + self.client.policy_pcr(handle, pcrs, bank_alg=bank_alg)
> self.client.policy_password(handle)
>
> result = self.client.unseal(self.root_key, blob, auth, handle)
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-11-23 8:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 19:17 [PATCH 0/2] selftests: tpm2: " Stefan Berger
2021-11-22 19:17 ` [PATCH 1/2] selftests: tpm: " Stefan Berger
2021-11-23 8:13 ` Marc-André Lureau [this message]
2021-11-24 7:28 ` Jarkko Sakkinen
2021-11-22 19:17 ` [PATCH 2/2] selftests: tpm2: Reset the dictionary attack lock Stefan Berger
2021-11-23 8:13 ` Marc-André Lureau
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=CAMxuvay+TJ8fs50GoZXUkX5NUsq20+xQBY3W5OSxMMvVGhJNow@mail.gmail.com \
--to=marcandre.lureau@redhat.com \
--cc=jarkko@kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=stefanb@linux.ibm.com \
--subject='Re: [PATCH 1/2] selftests: tpm: Probe for available PCR bank' \
/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
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).