jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-22 16:08:23 +08:00
Code Issues Projects Releases Wiki Activity

Provide workaround for #196

Browse Source
This commit is contained in:
vit9696 2020-04-22 19:25:36 +03:00
parent fc2d8f07b1
commit cd110eafa6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/ffsparser.cpp
View File

@ -3360,14 +3360,23 @@ USTATUS FfsParser::checkProtectedRanges(const UModelIndex & index)
// Calculate digest for BG-protected ranges // Calculate digest for BG-protected ranges
UByteArray protectedParts; UByteArray protectedParts;
bool bgProtectedRangeFound = false; bool bgProtectedRangeFound = false;
try {
for (UINT32 i = 0; i < (UINT32)bgProtectedRanges.size(); i++) { for (UINT32 i = 0; i < (UINT32)bgProtectedRanges.size(); i++) {
if (bgProtectedRanges[i].Type == BG_PROTECTED_RANGE_INTEL_BOOT_GUARD_IBB) { if (bgProtectedRanges[i].Type == BG_PROTECTED_RANGE_INTEL_BOOT_GUARD_IBB && bgProtectedRanges[i].Size > 0) {
bgProtectedRangeFound = true; bgProtectedRangeFound = true;
if ((UINT64)bgProtectedRanges[i].Offset >= addressDiff) {
bgProtectedRanges[i].Offset -= (UINT32)addressDiff; bgProtectedRanges[i].Offset -= (UINT32)addressDiff;
} else {
// TODO: Explore this.
msg(usprintf("%s: Suspicious BG protection offset", __FUNCTION__), index);
}
protectedParts += openedImage.mid(bgProtectedRanges[i].Offset, bgProtectedRanges[i].Size); protectedParts += openedImage.mid(bgProtectedRanges[i].Offset, bgProtectedRanges[i].Size);
markProtectedRangeRecursive(index, bgProtectedRanges[i]); markProtectedRangeRecursive(index, bgProtectedRanges[i]);
} }
} }
} catch (...) {
bgProtectedRangeFound = false;
}
if (bgProtectedRangeFound) { if (bgProtectedRangeFound) {
UByteArray digest(SHA256_DIGEST_SIZE, '\x00'); UByteArray digest(SHA256_DIGEST_SIZE, '\x00');