timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-06-21 06:30:52 +10:00
Code Issues Packages Projects Releases Wiki Activity

utilities.py: Fix SB Policy detection

Browse Source
This commit is contained in:
Mykola Grymalyuk
2022-05-08 10:07:12 -06:00
parent 4538341966
commit b76bb7fe20
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/device_probe.py
+2 -2
View File
@@ -486,7 +486,7 @@ class Computer:
ambient_light_sensor: Optional[bool] = False ambient_light_sensor: Optional[bool] = False
third_party_sata_ssd: Optional[bool] = False third_party_sata_ssd: Optional[bool] = False
secure_boot_model: Optional[str] = None secure_boot_model: Optional[str] = None
secure_boot_status: Optiona[int] = None secure_boot_policy: Optiona[int] = None
@staticmethod @staticmethod
def probe(): def probe():
@@ -709,7 +709,7 @@ class Computer:
# SecureBoot Variables # SecureBoot Variables
self.secure_boot_model = utilities.check_secure_boot_model() self.secure_boot_model = utilities.check_secure_boot_model()
self.secure_boot_status = utilities.check_ap_security_mode() self.secure_boot_policy = utilities.check_ap_security_policy()
def cpu_probe(self): def cpu_probe(self):
self.cpu = CPU( self.cpu = CPU(
subprocess.run("sysctl machdep.cpu.brand_string".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip(), subprocess.run("sysctl machdep.cpu.brand_string".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip(),
resources/utilities.py
+5 -5
View File
@@ -214,20 +214,20 @@ def check_secure_boot_model():
return sbm_string return sbm_string
return None return None
def check_ap_security_mode(): def check_ap_security_policy():
ap_security_mode_byte = get_nvram("ApSecurityMode", "94B73556-2197-4702-82A8-3E1337DAFBFB", decode=False) ap_security_policy_byte = get_nvram("AppleSecureBootPolicy", "94B73556-2197-4702-82A8-3E1337DAFBFB", decode=False)
if ap_security_mode_byte: if ap_security_policy_byte:
# Ref: # Ref:
# https://github.com/acidanthera/OpenCorePkg/blob/f7c1a3d483fa2535b6a62c25a4f04017bfeee09a/Include/Apple/Protocol/AppleImg4Verification.h#L27-L31 # https://github.com/acidanthera/OpenCorePkg/blob/f7c1a3d483fa2535b6a62c25a4f04017bfeee09a/Include/Apple/Protocol/AppleImg4Verification.h#L27-L31
# AppleImg4SbModeDisabled = 0, # AppleImg4SbModeDisabled = 0,
# AppleImg4SbModeMedium = 1, # AppleImg4SbModeMedium = 1,
# AppleImg4SbModeFull = 2 # AppleImg4SbModeFull = 2
return int.from_bytes(ap_security_mode_byte, byteorder="little") return int.from_bytes(ap_security_policy_byte, byteorder="little")
return 0 return 0
def check_secure_boot_level(): def check_secure_boot_level():
if check_secure_boot_model() in constants.Constants().sbm_values: if check_secure_boot_model() in constants.Constants().sbm_values:
if check_ap_security_mode() == 2: if check_ap_security_policy() == 2:
return True return True
else: else:
return False return False