summaryrefslogtreecommitdiff
path: root/tpm.c
diff options
context:
space:
mode:
Diffstat (limited to 'tpm.c')
-rw-r--r--tpm.c141
1 files changed, 67 insertions, 74 deletions
diff --git a/tpm.c b/tpm.c
index 05b3c6fb..674e69b7 100644
--- a/tpm.c
+++ b/tpm.c
@@ -3,17 +3,7 @@
#include <string.h>
#include <stdint.h>
-#include "tpm.h"
-
-extern UINT8 in_protocol;
-
-#define perror(fmt, ...) ({ \
- UINTN __perror_ret = 0; \
- if (!in_protocol) \
- __perror_ret = Print((fmt), ##__VA_ARGS__); \
- __perror_ret; \
- })
-
+#include "shim.h"
typedef struct {
CHAR16 *VariableName;
@@ -25,22 +15,18 @@ typedef struct {
UINTN measuredcount = 0;
VARIABLE_RECORD *measureddata = NULL;
-EFI_GUID tpm_guid = EFI_TPM_GUID;
-EFI_GUID tpm2_guid = EFI_TPM2_GUID;
-
static BOOLEAN tpm_present(efi_tpm_protocol_t *tpm)
{
- EFI_STATUS status;
+ EFI_STATUS efi_status;
TCG_EFI_BOOT_SERVICE_CAPABILITY caps;
UINT32 flags;
EFI_PHYSICAL_ADDRESS eventlog, lastevent;
caps.Size = (UINT8)sizeof(caps);
- status = uefi_call_wrapper(tpm->status_check, 5, tpm, &caps, &flags,
- &eventlog, &lastevent);
-
- if (status != EFI_SUCCESS || caps.TPMDeactivatedFlag
- || !caps.TPMPresentFlag)
+ efi_status = tpm->status_check(tpm, &caps, &flags,
+ &eventlog, &lastevent);
+ if (EFI_ERROR(efi_status) ||
+ caps.TPMDeactivatedFlag || !caps.TPMPresentFlag)
return FALSE;
return TRUE;
@@ -50,18 +36,19 @@ static EFI_STATUS tpm2_get_caps(efi_tpm2_protocol_t *tpm,
EFI_TCG2_BOOT_SERVICE_CAPABILITY *caps,
BOOLEAN *old_caps)
{
- EFI_STATUS status;
+ EFI_STATUS efi_status;
caps->Size = (UINT8)sizeof(*caps);
- status = uefi_call_wrapper(tpm->get_capability, 2, tpm, caps);
-
- if (status != EFI_SUCCESS)
- return status;
+ efi_status = tpm->get_capability(tpm, caps);
+ if (EFI_ERROR(efi_status))
+ return efi_status;
if (caps->StructureVersion.Major == 1 &&
caps->StructureVersion.Minor == 0)
*old_caps = TRUE;
+ else
+ *old_caps = FALSE;
return EFI_SUCCESS;
}
@@ -115,8 +102,7 @@ static EFI_STATUS trigger_tcg2_final_events_table(efi_tpm2_protocol_t *tpm2,
else
log_fmt = EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2;
- return uefi_call_wrapper(tpm2->get_event_log, 5, tpm2, log_fmt,
- &start, &end, &truncated);
+ return tpm2->get_event_log(tpm2, log_fmt, &start, &end, &truncated);
}
static EFI_STATUS tpm_locate_protocol(efi_tpm_protocol_t **tpm,
@@ -124,19 +110,19 @@ static EFI_STATUS tpm_locate_protocol(efi_tpm_protocol_t **tpm,
BOOLEAN *old_caps_p,
EFI_TCG2_BOOT_SERVICE_CAPABILITY *capsp)
{
- EFI_STATUS status;
+ EFI_STATUS efi_status;
*tpm = NULL;
*tpm2 = NULL;
- status = LibLocateProtocol(&tpm2_guid, (VOID **)tpm2);
+ efi_status = LibLocateProtocol(&EFI_TPM2_GUID, (VOID **)tpm2);
/* TPM 2.0 */
- if (status == EFI_SUCCESS) {
+ if (!EFI_ERROR(efi_status)) {
BOOLEAN old_caps;
EFI_TCG2_BOOT_SERVICE_CAPABILITY caps;
- status = tpm2_get_caps(*tpm2, &caps, &old_caps);
- if (EFI_ERROR(status))
- return status;
+ efi_status = tpm2_get_caps(*tpm2, &caps, &old_caps);
+ if (EFI_ERROR(efi_status))
+ return efi_status;
if (tpm2_present(&caps, old_caps)) {
if (old_caps_p)
@@ -146,9 +132,9 @@ static EFI_STATUS tpm_locate_protocol(efi_tpm_protocol_t **tpm,
return EFI_SUCCESS;
}
} else {
- status = LibLocateProtocol(&tpm_guid, (VOID **)tpm);
- if (EFI_ERROR(status))
- return status;
+ efi_status = LibLocateProtocol(&EFI_TPM_GUID, (VOID **)tpm);
+ if (EFI_ERROR(efi_status))
+ return efi_status;
if (tpm_present(*tpm))
return EFI_SUCCESS;
@@ -161,25 +147,35 @@ static EFI_STATUS tpm_log_event_raw(EFI_PHYSICAL_ADDRESS buf, UINTN size,
UINT8 pcr, const CHAR8 *log, UINTN logsize,
UINT32 type, CHAR8 *hash)
{
- EFI_STATUS status;
+ EFI_STATUS efi_status;
efi_tpm_protocol_t *tpm;
efi_tpm2_protocol_t *tpm2;
BOOLEAN old_caps;
EFI_TCG2_BOOT_SERVICE_CAPABILITY caps;
- status = tpm_locate_protocol(&tpm, &tpm2, &old_caps, &caps);
- if (EFI_ERROR(status)) {
- return status;
+ efi_status = tpm_locate_protocol(&tpm, &tpm2, &old_caps, &caps);
+ if (EFI_ERROR(efi_status)) {
+#ifdef REQUIRE_TPM
+ perror(L"TPM logging failed: %r\n", efi_status);
+ return efi_status;
+#else
+ if (efi_status != EFI_NOT_FOUND) {
+ perror(L"TPM logging failed: %r\n", efi_status);
+ return efi_status;
+ }
+#endif
} else if (tpm2) {
EFI_TCG2_EVENT *event;
EFI_TCG2_EVENT_LOG_BITMAP supported_logs;
supported_logs = tpm2_get_supported_logs(tpm2, &caps, old_caps);
- status = trigger_tcg2_final_events_table(tpm2, supported_logs);
- if (EFI_ERROR(status)) {
- perror(L"Unable to trigger tcg2 final events table: %r\n", status);
- return status;
+ efi_status = trigger_tcg2_final_events_table(tpm2,
+ supported_logs);
+ if (EFI_ERROR(efi_status)) {
+ perror(L"Unable to trigger tcg2 final events table: %r\n",
+ efi_status);
+ return efi_status;
}
event = AllocatePool(sizeof(*event) + logsize);
@@ -196,26 +192,26 @@ static EFI_STATUS tpm_log_event_raw(EFI_PHYSICAL_ADDRESS buf, UINTN size,
CopyMem(event->Event, (VOID *)log, logsize);
if (hash) {
/* TPM 2 systems will generate the appropriate hash
- themselves if we pass PE_COFF_IMAGE
+ themselves if we pass PE_COFF_IMAGE. In case that
+ fails we fall back to measuring without it.
*/
- status = uefi_call_wrapper(tpm2->hash_log_extend_event,
- 5, tpm2, PE_COFF_IMAGE, buf,
- (UINT64) size, event);
- } else {
- status = uefi_call_wrapper(tpm2->hash_log_extend_event,
- 5, tpm2, 0, buf,
- (UINT64) size, event);
+ efi_status = tpm2->hash_log_extend_event(tpm2,
+ PE_COFF_IMAGE, buf, (UINT64) size, event);
+ }
+
+ if (!hash || EFI_ERROR(efi_status)) {
+ efi_status = tpm2->hash_log_extend_event(tpm2,
+ 0, buf, (UINT64) size, event);
}
FreePool(event);
- return status;
+ return efi_status;
} else if (tpm) {
TCG_PCR_EVENT *event;
UINT32 eventnum = 0;
EFI_PHYSICAL_ADDRESS lastevent;
- status = LibLocateProtocol(&tpm_guid, (VOID **)&tpm);
-
- if (status != EFI_SUCCESS)
+ efi_status = LibLocateProtocol(&EFI_TPM_GUID, (VOID **)&tpm);
+ if (EFI_ERROR(efi_status))
return EFI_SUCCESS;
if (!tpm_present(tpm))
@@ -237,18 +233,15 @@ static EFI_STATUS tpm_log_event_raw(EFI_PHYSICAL_ADDRESS buf, UINTN size,
hash rather than allowing the firmware to attempt
to calculate it */
CopyMem(event->digest, hash, sizeof(event->digest));
- status = uefi_call_wrapper(tpm->log_extend_event, 7,
- tpm, 0, 0, TPM_ALG_SHA,
- event, &eventnum,
- &lastevent);
+ efi_status = tpm->log_extend_event(tpm, 0, 0,
+ TPM_ALG_SHA, event, &eventnum, &lastevent);
} else {
- status = uefi_call_wrapper(tpm->log_extend_event, 7,
- tpm, buf, (UINT64)size,
- TPM_ALG_SHA, event,
- &eventnum, &lastevent);
+ efi_status = tpm->log_extend_event(tpm, buf,
+ (UINT64)size, TPM_ALG_SHA, event, &eventnum,
+ &lastevent);
}
FreePool(event);
- return status;
+ return efi_status;
}
return EFI_SUCCESS;
@@ -335,7 +328,7 @@ static EFI_STATUS tpm_record_data_measurement(CHAR16 *VarName, EFI_GUID VendorGu
EFI_STATUS tpm_measure_variable(CHAR16 *VarName, EFI_GUID VendorGuid, UINTN VarSize, VOID *VarData)
{
- EFI_STATUS Status;
+ EFI_STATUS efi_status;
UINTN VarNameLength;
EFI_VARIABLE_DATA_TREE *VarLog;
UINT32 VarLogSize;
@@ -365,14 +358,14 @@ EFI_STATUS tpm_measure_variable(CHAR16 *VarName, EFI_GUID VendorGuid, UINTN VarS
CopyMem ((CHAR16 *)VarLog->UnicodeName + VarNameLength, VarData,
VarSize);
- Status = tpm_log_event_raw((EFI_PHYSICAL_ADDRESS)(intptr_t)VarLog,
- VarLogSize, 7, (CHAR8 *)VarLog, VarLogSize,
- EV_EFI_VARIABLE_AUTHORITY, NULL);
+ efi_status = tpm_log_event_raw((EFI_PHYSICAL_ADDRESS)(intptr_t)VarLog,
+ VarLogSize, 7, (CHAR8 *)VarLog, VarLogSize,
+ EV_EFI_VARIABLE_AUTHORITY, NULL);
FreePool(VarLog);
- if (Status != EFI_SUCCESS)
- return Status;
+ if (EFI_ERROR(efi_status))
+ return efi_status;
return tpm_record_data_measurement(VarName, VendorGuid, VarSize,
VarData);
@@ -381,12 +374,12 @@ EFI_STATUS tpm_measure_variable(CHAR16 *VarName, EFI_GUID VendorGuid, UINTN VarS
EFI_STATUS
fallback_should_prefer_reset(void)
{
- EFI_STATUS status;
+ EFI_STATUS efi_status;
efi_tpm_protocol_t *tpm;
efi_tpm2_protocol_t *tpm2;
- status = tpm_locate_protocol(&tpm, &tpm2, NULL, NULL);
- if (EFI_ERROR(status))
+ efi_status = tpm_locate_protocol(&tpm, &tpm2, NULL, NULL);
+ if (EFI_ERROR(efi_status))
return EFI_NOT_FOUND;
return EFI_SUCCESS;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-07 16:27:14 +0000