**/\r
VOID *\r
TpmMeasurementGetFvName (\r
- IN EFI_PHYSICAL_ADDRESS FvBase,\r
- IN UINT64 FvLength\r
+ IN EFI_PHYSICAL_ADDRESS FvBase,\r
+ IN UINT64 FvLength\r
)\r
{\r
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;\r
if (FvBase >= MAX_ADDRESS) {\r
return NULL;\r
}\r
+\r
if (FvLength >= MAX_ADDRESS - FvBase) {\r
return NULL;\r
}\r
- if (FvLength < sizeof(EFI_FIRMWARE_VOLUME_HEADER)) {\r
+\r
+ if (FvLength < sizeof (EFI_FIRMWARE_VOLUME_HEADER)) {\r
return NULL;\r
}\r
\r
if (FvHeader->Signature != EFI_FVH_SIGNATURE) {\r
return NULL;\r
}\r
- if (FvHeader->ExtHeaderOffset < sizeof(EFI_FIRMWARE_VOLUME_HEADER)) {\r
+\r
+ if (FvHeader->ExtHeaderOffset < sizeof (EFI_FIRMWARE_VOLUME_HEADER)) {\r
return NULL;\r
}\r
- if (FvHeader->ExtHeaderOffset + sizeof(EFI_FIRMWARE_VOLUME_EXT_HEADER) > FvLength) {\r
+\r
+ if (FvHeader->ExtHeaderOffset + sizeof (EFI_FIRMWARE_VOLUME_EXT_HEADER) > FvLength) {\r
return NULL;\r
}\r
+\r
FvExtHeader = (EFI_FIRMWARE_VOLUME_EXT_HEADER *)(UINTN)(FvBase + FvHeader->ExtHeaderOffset);\r
\r
return &FvExtHeader->FvName;\r
EFI_STATUS\r
EFIAPI\r
MeasureFirmwareBlob (\r
- IN UINT32 PcrIndex,\r
- IN CHAR8 *Description OPTIONAL,\r
- IN EFI_PHYSICAL_ADDRESS FirmwareBlobBase,\r
- IN UINT64 FirmwareBlobLength\r
+ IN UINT32 PcrIndex,\r
+ IN CHAR8 *Description OPTIONAL,\r
+ IN EFI_PHYSICAL_ADDRESS FirmwareBlobBase,\r
+ IN UINT64 FirmwareBlobLength\r
)\r
{\r
- EFI_PLATFORM_FIRMWARE_BLOB FvBlob;\r
- PLATFORM_FIRMWARE_BLOB2_STRUCT FvBlob2;\r
- VOID *FvName;\r
- UINT32 EventType;\r
- VOID *EventLog;\r
- UINT32 EventLogSize;\r
- EFI_STATUS Status;\r
+ EFI_PLATFORM_FIRMWARE_BLOB FvBlob;\r
+ PLATFORM_FIRMWARE_BLOB2_STRUCT FvBlob2;\r
+ VOID *FvName;\r
+ UINT32 EventType;\r
+ VOID *EventLog;\r
+ UINT32 EventLogSize;\r
+ EFI_STATUS Status;\r
\r
FvName = TpmMeasurementGetFvName (FirmwareBlobBase, FirmwareBlobLength);\r
\r
if (((Description != NULL) || (FvName != NULL)) &&\r
- (PcdGet32(PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105)) {\r
+ (PcdGet32 (PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105))\r
+ {\r
if (Description != NULL) {\r
- AsciiSPrint((CHAR8*)FvBlob2.BlobDescription, sizeof(FvBlob2.BlobDescription), "%a", Description);\r
+ AsciiSPrint ((CHAR8 *)FvBlob2.BlobDescription, sizeof (FvBlob2.BlobDescription), "%a", Description);\r
} else {\r
- AsciiSPrint((CHAR8*)FvBlob2.BlobDescription, sizeof(FvBlob2.BlobDescription), "Fv(%g)", FvName);\r
+ AsciiSPrint ((CHAR8 *)FvBlob2.BlobDescription, sizeof (FvBlob2.BlobDescription), "Fv(%g)", FvName);\r
}\r
\r
- FvBlob2.BlobDescriptionSize = sizeof(FvBlob2.BlobDescription);\r
- FvBlob2.BlobBase = FirmwareBlobBase;\r
- FvBlob2.BlobLength = FirmwareBlobLength;\r
+ FvBlob2.BlobDescriptionSize = sizeof (FvBlob2.BlobDescription);\r
+ FvBlob2.BlobBase = FirmwareBlobBase;\r
+ FvBlob2.BlobLength = FirmwareBlobLength;\r
\r
- EventType = EV_EFI_PLATFORM_FIRMWARE_BLOB2;\r
- EventLog = &FvBlob2;\r
- EventLogSize = sizeof(FvBlob2);\r
+ EventType = EV_EFI_PLATFORM_FIRMWARE_BLOB2;\r
+ EventLog = &FvBlob2;\r
+ EventLogSize = sizeof (FvBlob2);\r
} else {\r
- FvBlob.BlobBase = FirmwareBlobBase;\r
+ FvBlob.BlobBase = FirmwareBlobBase;\r
FvBlob.BlobLength = FirmwareBlobLength;\r
\r
- EventType = EV_EFI_PLATFORM_FIRMWARE_BLOB;\r
- EventLog = &FvBlob;\r
- EventLogSize = sizeof(FvBlob);\r
+ EventType = EV_EFI_PLATFORM_FIRMWARE_BLOB;\r
+ EventLog = &FvBlob;\r
+ EventLogSize = sizeof (FvBlob);\r
}\r
\r
Status = TpmMeasureAndLogData (\r
EventType,\r
EventLog,\r
EventLogSize,\r
- (VOID*)(UINTN)FirmwareBlobBase,\r
+ (VOID *)(UINTN)FirmwareBlobBase,\r
FirmwareBlobLength\r
);\r
\r
EFI_STATUS\r
EFIAPI\r
MeasureHandoffTable (\r
- IN UINT32 PcrIndex,\r
- IN CHAR8 *Description OPTIONAL,\r
- IN EFI_GUID *TableGuid,\r
- IN VOID *TableAddress,\r
- IN UINTN TableLength\r
+ IN UINT32 PcrIndex,\r
+ IN CHAR8 *Description OPTIONAL,\r
+ IN EFI_GUID *TableGuid,\r
+ IN VOID *TableAddress,\r
+ IN UINTN TableLength\r
)\r
{\r
- EFI_HANDOFF_TABLE_POINTERS HandoffTables;\r
- HANDOFF_TABLE_POINTERS2_STRUCT HandoffTables2;\r
- UINT32 EventType;\r
- VOID *EventLog;\r
- UINT32 EventLogSize;\r
- EFI_STATUS Status;\r
+ EFI_HANDOFF_TABLE_POINTERS HandoffTables;\r
+ HANDOFF_TABLE_POINTERS2_STRUCT HandoffTables2;\r
+ UINT32 EventType;\r
+ VOID *EventLog;\r
+ UINT32 EventLogSize;\r
+ EFI_STATUS Status;\r
\r
if ((Description != NULL) &&\r
- (PcdGet32(PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105)) {\r
- AsciiSPrint((CHAR8*)HandoffTables2.TableDescription, sizeof(HandoffTables2.TableDescription), "%a", Description);\r
+ (PcdGet32 (PcdTcgPfpMeasurementRevision) >= TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2_REV_105))\r
+ {\r
+ AsciiSPrint ((CHAR8 *)HandoffTables2.TableDescription, sizeof (HandoffTables2.TableDescription), "%a", Description);\r
\r
- HandoffTables2.TableDescriptionSize = sizeof(HandoffTables2.TableDescription);\r
- HandoffTables2.NumberOfTables = 1;\r
+ HandoffTables2.TableDescriptionSize = sizeof (HandoffTables2.TableDescription);\r
+ HandoffTables2.NumberOfTables = 1;\r
CopyGuid (&(HandoffTables2.TableEntry[0].VendorGuid), TableGuid);\r
HandoffTables2.TableEntry[0].VendorTable = TableAddress;\r
\r
- EventType = EV_EFI_HANDOFF_TABLES2;\r
- EventLog = &HandoffTables2;\r
- EventLogSize = sizeof(HandoffTables2);\r
+ EventType = EV_EFI_HANDOFF_TABLES2;\r
+ EventLog = &HandoffTables2;\r
+ EventLogSize = sizeof (HandoffTables2);\r
} else {\r
HandoffTables.NumberOfTables = 1;\r
CopyGuid (&(HandoffTables.TableEntry[0].VendorGuid), TableGuid);\r
HandoffTables.TableEntry[0].VendorTable = TableAddress;\r
\r
- EventType = EV_EFI_HANDOFF_TABLES;\r
- EventLog = &HandoffTables;\r
- EventLogSize = sizeof(HandoffTables);\r
+ EventType = EV_EFI_HANDOFF_TABLES;\r
+ EventLog = &HandoffTables;\r
+ EventLogSize = sizeof (HandoffTables);\r
}\r
\r
Status = TpmMeasureAndLogData (\r