diff options
Diffstat (limited to 'BaseTools/Source/C/Common')
| -rw-r--r-- | BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 4 | ||||
| -rw-r--r-- | BaseTools/Source/C/Common/FvLib.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c index d51e359043..2d3b1353cb 100644 --- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c +++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c @@ -236,8 +236,8 @@ Returns: if (File->Attributes & FFS_ATTRIB_CHECKSUM) {
File->IntegrityCheck.Checksum.File = FvBufCalculateChecksum8 (
- (VOID*)File,
- FileSize
+ (VOID*)(File + 1),
+ FileSize - sizeof (EFI_FFS_FILE_HEADER)
);
} else {
File->IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
diff --git a/BaseTools/Source/C/Common/FvLib.c b/BaseTools/Source/C/Common/FvLib.c index 292b077f34..dc50e877e6 100644 --- a/BaseTools/Source/C/Common/FvLib.c +++ b/BaseTools/Source/C/Common/FvLib.c @@ -703,8 +703,8 @@ Returns: // Verify file data checksum
//
FileLength = GetLength (FfsHeader->Size);
- Checksum = CalculateSum8 ((UINT8 *) FfsHeader, FileLength);
- Checksum = (UINT8) (Checksum - FfsHeader->State);
+ Checksum = CalculateSum8 ((UINT8 *) (FfsHeader + 1), FileLength - sizeof (EFI_FFS_FILE_HEADER));
+ Checksum = Checksum + FfsHeader->IntegrityCheck.Checksum.File;
if (Checksum != 0) {
Error (NULL, 0, 0006, "invalid FFS file checksum", "Ffs file with Guid %s", FileGuidString);
return EFI_ABORTED;
@@ -712,7 +712,7 @@ Returns: } else {
//
// File does not have a checksum
- // Verify contents are 0x5A as spec'd
+ // Verify contents are 0xAA as spec'd
//
if (FfsHeader->IntegrityCheck.Checksum.File != FFS_FIXED_CHECKSUM) {
Error (NULL, 0, 0006, "invalid fixed FFS file header checksum", "Ffs file with Guid %s", FileGuidString);
|