brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

tpm: Change response length of tpm2_get_capability()

Browse Source 
For implementing the EFI_TCG2_PROTOCOL we need the count field returned by
the TPM when reading capabilities via tpm2_get_capability().

Adjust the implementation of the 'tpm2 get_capability' command accordingly.

Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Ilias Apalodimas 2020-11-05 23:58:43 +02:00 committed by Heinrich Schuchardt
parent b1aa6fcf27
commit a322f54f50
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tpm-v2.c
View File

@ -191,10 +191,10 @@ static int do_tpm_get_capability(struct cmd_tbl *cmdtp, int flag, int argc,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
printf("Property 0x"); printf("Property 0x");
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
printf("%02x", data[(i * 8) + j]); printf("%02x", data[(i * 8) + j + sizeof(u32)]);
printf(": 0x"); printf(": 0x");
for (j = 4; j < 8; j++) for (j = 4; j < 8; j++)
printf("%02x", data[(i * 8) + j]); printf("%02x", data[(i * 8) + j + sizeof(u32)]);
printf("\n"); printf("\n");
} }

4
lib/tpm-v2.c
View File

@ -184,10 +184,10 @@ u32 tpm2_get_capability(struct udevice *dev, u32 capability, u32 property,
/* /*
* In the response buffer, the properties are located after the: * In the response buffer, the properties are located after the:
* tag (u16), response size (u32), response code (u32), * tag (u16), response size (u32), response code (u32),
* YES/NO flag (u8), TPM_CAP (u32) and TPMU_CAPABILITIES (u32). * YES/NO flag (u8), TPM_CAP (u32).
*/ */
properties_off = sizeof(u16) + sizeof(u32) + sizeof(u32) + properties_off = sizeof(u16) + sizeof(u32) + sizeof(u32) +
sizeof(u8) + sizeof(u32) + sizeof(u32); sizeof(u8) + sizeof(u32);
memcpy(buf, &response[properties_off], response_len - properties_off); memcpy(buf, &response[properties_off], response_len - properties_off);
return 0; return 0;