MIME-Version: 1.0
References: <20211122191752.1308953-1-stefanb@linux.ibm.com> <20211122191752.1308953-2-stefanb@linux.ibm.com>
In-Reply-To: <20211122191752.1308953-2-stefanb@linux.ibm.com>
From:   =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= <marcandre.lureau@redhat.com>
Date:   Tue, 23 Nov 2021 12:13:21 +0400
Message-ID: <CAMxuvay+TJ8fs50GoZXUkX5NUsq20+xQBY3W5OSxMMvVGhJNow@mail.gmail.com>
Subject: Re: [PATCH 1/2] selftests: tpm: Probe for available PCR bank
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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Nov 22, 2021 at 11:18 PM Stefan Berger <stefanb@linux.ibm.com> wrot=
e:
>
> 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=C3=A9 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/s=
elftests/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 =3D 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 =3D self.client.start_auth_session(tpm2.TPM2_SE_T=
RIAL)
> +                self.client.policy_pcr(handle, [17], bank_alg=3Dbank_alg=
)
> +                break
> +            except tpm2.UnknownPCRBankError:
> +                pass
> +            finally:
> +                self.client.flush_context(handle)
> +        return bank_alg
> +
>      def test_seal_with_policy(self):
> +        bank_alg =3D self.determine_bank_alg()
>          handle =3D self.client.start_auth_session(tpm2.TPM2_SE_TRIAL)
>
>          data =3D ('X' * 64).encode()
> @@ -35,7 +49,7 @@ class SmokeTest(unittest.TestCase):
>          pcrs =3D [16]
>
>          try:
> -            self.client.policy_pcr(handle, pcrs)
> +            self.client.policy_pcr(handle, pcrs, bank_alg=3Dbank_alg)
>              self.client.policy_password(handle)
>
>              policy_dig =3D self.client.get_policy_digest(handle)
> @@ -47,7 +61,7 @@ class SmokeTest(unittest.TestCase):
>          handle =3D self.client.start_auth_session(tpm2.TPM2_SE_POLICY)
>
>          try:
> -            self.client.policy_pcr(handle, pcrs)
> +            self.client.policy_pcr(handle, pcrs, bank_alg=3Dbank_alg)
>              self.client.policy_password(handle)
>
>              result =3D self.client.unseal(self.root_key, blob, auth, han=
dle)
> @@ -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 =3D self.determine_bank_alg()
>          handle =3D self.client.start_auth_session(tpm2.TPM2_SE_TRIAL)
>
>          data =3D ('X' * 64).encode()
> @@ -79,7 +94,7 @@ class SmokeTest(unittest.TestCase):
>          pcrs =3D [16]
>
>          try:
> -            self.client.policy_pcr(handle, pcrs)
> +            self.client.policy_pcr(handle, pcrs, bank_alg=3Dbank_alg)
>              self.client.policy_password(handle)
>
>              policy_dig =3D 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 u=
nseal.
>          # This should succeed.
>
> -        ds =3D tpm2.get_digest_size(tpm2.TPM2_ALG_SHA1)
> -        self.client.extend_pcr(1, ('X' * ds).encode())
> +        ds =3D tpm2.get_digest_size(bank_alg)
> +        self.client.extend_pcr(1, ('X' * ds).encode(), bank_alg=3Dbank_a=
lg)
>
>          handle =3D self.client.start_auth_session(tpm2.TPM2_SE_POLICY)
>
>          try:
> -            self.client.policy_pcr(handle, pcrs)
> +            self.client.policy_pcr(handle, pcrs, bank_alg=3Dbank_alg)
>              self.client.policy_password(handle)
>
>              result =3D self.client.unseal(self.root_key, blob, auth, han=
dle)
> @@ -109,14 +124,14 @@ class SmokeTest(unittest.TestCase):
>
>          # Then, extend a PCR that is part of the policy and try to unsea=
l.
>          # This should fail.
> -        self.client.extend_pcr(16, ('X' * ds).encode())
> +        self.client.extend_pcr(16, ('X' * ds).encode(), bank_alg=3Dbank_=
alg)
>
>          handle =3D self.client.start_auth_session(tpm2.TPM2_SE_POLICY)
>
>          rc =3D 0
>
>          try:
> -            self.client.policy_pcr(handle, pcrs)
> +            self.client.policy_pcr(handle, pcrs, bank_alg=3Dbank_alg)
>              self.client.policy_password(handle)
>
>              result =3D self.client.unseal(self.root_key, blob, auth, han=
dle)
> --
> 2.31.1
>