diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ukify/ukify.py | 84 |
1 files changed, 19 insertions, 65 deletions
diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py index caa9a04000..1ab383f5a9 100755 --- a/src/ukify/ukify.py +++ b/src/ukify/ukify.py @@ -42,6 +42,7 @@ import subprocess import sys import tempfile import textwrap +import uuid from collections.abc import Iterable, Iterator, Sequence from hashlib import sha256 from pathlib import Path @@ -1013,14 +1014,9 @@ def merge_sbat(input_pe: list[Path], input_text: list[str]) -> str: ) -# Keep in sync with EFI_GUID (src/boot/efi.h) -# uint32_t Data1, uint16_t Data2, uint16_t Data3, uint8_t Data4[8] -EFI_GUID = tuple[int, int, int, tuple[int, int, int, int, int, int, int, int]] -EFI_GUID_STRUCT_SIZE = 4 + 2 + 2 + 1 * 8 - # Keep in sync with Device (DEVICE_TYPE_DEVICETREE) from src/boot/chid.h # uint32_t descriptor, EFI_GUID chid, uint32_t name_offset, uint32_t compatible_offset -DEVICE_STRUCT_SIZE = 4 + EFI_GUID_STRUCT_SIZE + 4 + 4 +DEVICE_STRUCT_SIZE = 4 + 16 + 4 + 4 NULL_DEVICE = b'\0' * DEVICE_STRUCT_SIZE DEVICE_TYPE_DEVICETREE = 1 @@ -1029,29 +1025,21 @@ def device_make_descriptor(device_type: int, size: int) -> int: return (size) | (device_type << 28) -def pack_device(offsets: dict[str, int], name: str, compatible: str, chids: list[EFI_GUID]) -> bytes: +DEVICETREE_DESCRIPTOR = device_make_descriptor(DEVICE_TYPE_DEVICETREE, DEVICE_STRUCT_SIZE) + + +def pack_device(offsets: dict[str, int], name: str, compatible: str, chids: set[uuid.UUID]) -> bytes: data = b'' - for data1, data2, data3, data4 in chids: - data += struct.pack( - '<IIHH8BII', - device_make_descriptor(DEVICE_TYPE_DEVICETREE, DEVICE_STRUCT_SIZE), - data1, - data2, - data3, - *data4, - offsets[name], - offsets[compatible], - ) + for chid in sorted(chids): + data += struct.pack('<I', DEVICETREE_DESCRIPTOR) + data += chid.bytes_le + data += struct.pack('<II', offsets[name], offsets[compatible]) assert len(data) == DEVICE_STRUCT_SIZE * len(chids) return data -def hex_pairs_list(string: str) -> list[int]: - return [int(string[i : i + 2], 16) for i in range(0, len(string), 2)] - - def pack_strings(strings: set[str], base: int) -> tuple[bytes, dict[str, int]]: blob = b'' offsets = {} @@ -1064,56 +1052,22 @@ def pack_strings(strings: set[str], base: int) -> tuple[bytes, dict[str, int]]: def parse_hwid_dir(path: Path) -> bytes: - hwid_files = path.rglob('*.txt') + hwid_files = path.rglob('*.json') strings: set[str] = set() - devices: collections.defaultdict[tuple[str, str], list[EFI_GUID]] = collections.defaultdict(list) - - uuid_regexp = re.compile( - r'\{[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}\}', re.I - ) + devices: collections.defaultdict[tuple[str, str], set[uuid.UUID]] = collections.defaultdict(set) for hwid_file in hwid_files: - content = hwid_file.open().readlines() - - data: dict[str, str] = { - 'Manufacturer': '', - 'Family': '', - 'Compatible': '', - } - uuids: list[EFI_GUID] = [] + data = json.loads(hwid_file.read_text(encoding='UTF-8')) - for line in content: - for k in data: - if line.startswith(k): - data[k] = line.split(':')[1].strip() - break - else: - uuid = uuid_regexp.match(line) - if uuid is not None: - d1, d2, d3, d4, d5 = uuid.group(0)[1:-1].split('-') - - data1 = int(d1, 16) - data2 = int(d2, 16) - data3 = int(d3, 16) - data4 = cast( - tuple[int, int, int, int, int, int, int, int], - tuple(hex_pairs_list(d4) + hex_pairs_list(d5)), - ) - - uuids.append((data1, data2, data3, data4)) - - for k, v in data.items(): - if not v: + for k in ['name', 'compatible', 'hwids']: + if k not in data: raise ValueError(f'hwid description file "{hwid_file}" does not contain "{k}"') - name = data['Manufacturer'] + ' ' + data['Family'] - compatible = data['Compatible'] - - strings |= set([name, compatible]) + strings |= {data['name'], data['compatible']} - # (compatible, name) pair uniquely identifies the device - devices[(compatible, name)] += uuids + # (name, compatible) pair uniquely identifies the device + devices[(data['name'], data['compatible'])] |= {uuid.UUID(u) for u in data['hwids']} total_device_structs = 1 for dev, uuids in devices.items(): @@ -1122,7 +1076,7 @@ def parse_hwid_dir(path: Path) -> bytes: strings_blob, offsets = pack_strings(strings, total_device_structs * DEVICE_STRUCT_SIZE) devices_blob = b'' - for (compatible, name), uuids in devices.items(): + for (name, compatible), uuids in devices.items(): devices_blob += pack_device(offsets, name, compatible, uuids) devices_blob += NULL_DEVICE |