diff options
| author | Joel Kitching <kitching@google.com> | 2020-07-06 13:58:11 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-10 06:33:46 +0000 |
| commit | 28eededf643cc3cb278e8aa276b9c97e527dabdb (patch) | |
| tree | 1a29c05e0ecaaed4600df2f3d86f81e77555f618 /firmware/lib/tpm2_lite/tlcl.c | |
| parent | a3815e035f442473300951dc0ea93c3f01297659 (diff) | |
| download | vboot-28eededf643cc3cb278e8aa276b9c97e527dabdb.tar.gz | |
vboot: move TPM callbacks to vboot2 namespace
Move TPM callback definitions from vboot_api.h to 2api.h.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Cq-Depend: chromium:2282023
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Iad9da9fd3b6786609148d08b88f2e62ac3dee627
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2282322
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/lib/tpm2_lite/tlcl.c')
| -rw-r--r-- | firmware/lib/tpm2_lite/tlcl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/firmware/lib/tpm2_lite/tlcl.c b/firmware/lib/tpm2_lite/tlcl.c index 9bacbb6b..e4695d12 100644 --- a/firmware/lib/tpm2_lite/tlcl.c +++ b/firmware/lib/tpm2_lite/tlcl.c @@ -10,7 +10,6 @@ #include "2sysincludes.h" #include "tlcl.h" #include "tpm2_marshaling.h" -#include "vboot_api.h" /* * TODO(chromium:1032930): Originally accessed by including secdata_tpm.h. @@ -56,7 +55,7 @@ static uint32_t tpm_get_response(TPM_CC command, } in_size = sizeof(cr_buffer); - res = VbExTpmSendReceive(cr_buffer, out_size, cr_buffer, &in_size); + res = vb2ex_tpm_send_recv(cr_buffer, out_size, cr_buffer, &in_size); if (res != TPM_SUCCESS) { VB2_DEBUG("tpm transaction failed for %#x with error %#x\n", command, res); @@ -118,7 +117,7 @@ uint32_t TlclLibInit(void) { uint32_t rv; - rv = VbExTpmInit(); + rv = vb2ex_tpm_init(); if (rv != TPM_SUCCESS) return rv; @@ -131,7 +130,7 @@ uint32_t TlclLibInit(void) uint32_t TlclLibClose(void) { - return VbExTpmClose(); + return vb2ex_tpm_close(); } uint32_t TlclSendReceive(const uint8_t *request, uint8_t *response, @@ -140,8 +139,8 @@ uint32_t TlclSendReceive(const uint8_t *request, uint8_t *response, uint32_t rv, resp_size; resp_size = max_length; - rv = VbExTpmSendReceive(request, tpm_get_packet_size(request), - response, &resp_size); + rv = vb2ex_tpm_send_recv(request, tpm_get_packet_size(request), + response, &resp_size); return rv ? rv : tpm_get_packet_response_code(response); } |