diff options
| author | Peter Jones <pjones@redhat.com> | 2017-10-19 14:43:18 -0400 |
|---|---|---|
| committer | Peter Jones <pmjones@gmail.com> | 2018-03-12 16:21:43 -0400 |
| commit | b953468e91eac48d2e3817f18cd604e20f39c56b (patch) | |
| tree | 89a6bf338b4dc3202a6d1cf283cd9beb1c97a02b /tpm.c | |
| parent | 4d70f104818b947873698b5d9ba79e374e5b7586 (diff) | |
| download | efi-boot-shim-b953468e91eac48d2e3817f18cd604e20f39c56b.tar.gz efi-boot-shim-b953468e91eac48d2e3817f18cd604e20f39c56b.zip | |
Don't have tons of local guid definitions for no reason at all.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'tpm.c')
| -rw-r--r-- | tpm.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -23,9 +23,6 @@ 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; @@ -126,7 +123,7 @@ static EFI_STATUS tpm_locate_protocol(efi_tpm_protocol_t **tpm, *tpm = NULL; *tpm2 = NULL; - status = LibLocateProtocol(&tpm2_guid, (VOID **)tpm2); + status = LibLocateProtocol(&EFI_TPM2_GUID, (VOID **)tpm2); /* TPM 2.0 */ if (status == EFI_SUCCESS) { BOOLEAN old_caps; @@ -144,7 +141,7 @@ static EFI_STATUS tpm_locate_protocol(efi_tpm_protocol_t **tpm, return EFI_SUCCESS; } } else { - status = LibLocateProtocol(&tpm_guid, (VOID **)tpm); + status = LibLocateProtocol(&EFI_TPM_GUID, (VOID **)tpm); if (EFI_ERROR(status)) return status; @@ -214,7 +211,7 @@ static EFI_STATUS tpm_log_event_raw(EFI_PHYSICAL_ADDRESS buf, UINTN size, UINT32 eventnum = 0; EFI_PHYSICAL_ADDRESS lastevent; - status = LibLocateProtocol(&tpm_guid, (VOID **)&tpm); + status = LibLocateProtocol(&EFI_TPM_GUID, (VOID **)&tpm); if (status != EFI_SUCCESS) return EFI_SUCCESS; |