summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-08-29 14:43:34 +0800
committerCommit Bot <commit-bot@chromium.org>2019-08-31 20:49:19 +0000
commit33655b34f36efa06fc82c0cd5b8ee7674538f72b (patch)
tree790f0e30b0d1ae1780053e468906002bdf739c30
parent479f2d6927a9eb4995b4a1d2185fa809934b63ad (diff)
downloadvboot-33655b34f36efa06fc82c0cd5b8ee7674538f72b.tar.gz
vboot: add mocked TlclDefineSpaceEx function
Allows the case of FIRMWARE_ARCH= TPM2_MODE= MOCK_TPM=1 to compile. Also wrap TlclUndefineSpace in #ifdef CHROMEOS_ENVIRONMENT to match its non-mocked definition. BUG=b:124141368, chromium:997132 TEST=make clean && TPM2_MODE= MOCK_TPM=1 make runtests BRANCH=none Change-Id: I681dcb239c0bff9530df84a0a4f848e73384c798 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1773095 Commit-Queue: Joel Kitching <kitching@chromium.org> Tested-by: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--firmware/lib/tpm_lite/mocked_tlcl.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/firmware/lib/tpm_lite/mocked_tlcl.c b/firmware/lib/tpm_lite/mocked_tlcl.c
index c9f56de9..ec5a152a 100644
--- a/firmware/lib/tpm_lite/mocked_tlcl.c
+++ b/firmware/lib/tpm_lite/mocked_tlcl.c
@@ -50,11 +50,22 @@ uint32_t TlclDefineSpace(uint32_t index, uint32_t perm, uint32_t size)
return TPM_SUCCESS;
}
+uint32_t TlclDefineSpaceEx(const uint8_t* owner_auth, uint32_t owner_auth_size,
+ uint32_t index, uint32_t perm, uint32_t size,
+ const void* auth_policy, uint32_t auth_policy_size)
+{
+ return TPM_SUCCESS;
+}
+
+#ifdef CHROMEOS_ENVIRONMENT
+
uint32_t TlclUndefineSpace(uint32_t index)
{
return TPM_SUCCESS;
}
+#endif /* CHROMEOS_ENVIRONMENT */
+
uint32_t TlclWrite(uint32_t index, const void* data, uint32_t length)
{
return TPM_SUCCESS;