mirror/86Box-bios-tools
1
0
Fork 0
mirror of https://github.com/86Box/bios-tools.git synced 2026-02-23 09:58:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve Intel UEFI version detection

Browse Source
This commit is contained in:
RichardG867
2022-02-04 14:45:46 -03:00
parent 66e8183f6e
commit b0dec0cbb7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
biostools/analyzers.py
View File

@@ -1445,7 +1445,11 @@ class IntelUEFIAnalyzer(Analyzer):
super().__init__('Intel', *args, **kwargs)
self.vendor_id = 'IntelUEFI'
self._identifier_pattern = re.compile(b'''(?:\\$(?:IBIOSI\\$|FID|UBI)|Load Error\\x00{2}Success\\x00|S\\x00l\\x00o\\x00t\\x00 \\x00\\x30\\x00:\\x00 \\x00+)([0-9A-Z]{8}\\.[0-9A-Z]{3}(?:\\.[0-9]{4}){4})''')
# The Intel version's location is not super consistent throughout the
# years. The second path helps here by providing a second opinion,
# though one that might fail if a weird version string is somehow found.
self._identifier_pattern = re.compile(b'''(?:\\$(?:IBIOSI\\$|FID|UBI)|Load Error\\x00{2}Success\\x00|S\\x00l\\x00o\\x00t\\x00 \\x00\\x30\\x00:\\x00 \\x00+)([0-9A-Z]{8}\\.[0-9A-Z]{3}(?:\\.[0-9]{4}){4})|'''
b'''([A-Z]{2}[0-9A-Z]{3}[0-9]{2}[A-Z]\\.[0-9]{2}[A-Z](?:\\.[0-9]{4}){4})''')
def can_handle(self, file_data, header_data):
# Only handle files sent through UEFIExtractor.
@@ -1459,8 +1463,8 @@ class IntelUEFIAnalyzer(Analyzer):
self.version = 'UEFI'
# Extract sign-on.
self.signon = match.group(1).decode('cp437', 'ignore')
# Extract Intel version as a sign-on.
self.signon = (match.group(1) or match.group(2)).decode('cp437', 'ignore')
return True