Increment Binaries

This commit is contained in:
Mykola Grymalyuk
2021-11-01 10:20:12 -06:00
parent 75ca458747
commit 4424209d3e
15 changed files with 13 additions and 61 deletions

View File

@@ -7,6 +7,10 @@
- Adjust SIP setting to better reflect current SIP usage - Adjust SIP setting to better reflect current SIP usage
- Resolve Monterey Bluetooth issues on user-upgraded BCM94331 BT4.0 modules - Resolve Monterey Bluetooth issues on user-upgraded BCM94331 BT4.0 modules
- Fix iGPU-only iMac14,x display output when using Minimal/Moderate spoof - Fix iGPU-only iMac14,x display output when using Minimal/Moderate spoof
- Increment Binaries:
- OpenCore 0.7.5 - release
- BrcmPatchRAM 2.6.1 - release
- WhateverGreen 1.5.5 - release
## 0.3.1 ## 0.3.1
- Increment Binaries: - Increment Binaries:

View File

@@ -300,6 +300,8 @@
<integer>0</integer> <integer>0</integer>
<key>RebuildAppleMemoryMap</key> <key>RebuildAppleMemoryMap</key>
<false/> <false/>
<key>ResizeAppleGpuBars</key>
<integer>-1</integer>
<key>SetupVirtualMap</key> <key>SetupVirtualMap</key>
<false/> <false/>
<key>SignalAppleOS</key> <key>SignalAppleOS</key>
@@ -2018,6 +2020,8 @@
<false/> <false/>
<key>RequestBootVarRouting</key> <key>RequestBootVarRouting</key>
<true/> <true/>
<key>ResizeGpuBars</key>
<integer>-1</integer>
<key>TscSyncTimeout</key> <key>TscSyncTimeout</key>
<integer>0</integer> <integer>0</integer>
<key>UnblockFsConnect</key> <key>UnblockFsConnect</key>

View File

@@ -1,56 +0,0 @@
diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp
index 0fa891a..18e4b74 100644
--- a/BrcmPatchRAM/BlueToolFixup.cpp
+++ b/BrcmPatchRAM/BlueToolFixup.cpp
@@ -37,8 +37,10 @@ bool BlueToolFixup::start(IOService *provider) {
}
setProperty("VersionInfo", kextVersion);
setName("bluetooth");
+ /*
uint8_t bytes[] {0x00, 0x00, 0x00, 0x00};
setProperty("transport-encoding", bytes, sizeof(bytes));
+ */
registerService();
return true;
@@ -50,7 +52,22 @@ bool BlueToolFixup::start(IOService *provider) {
static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate";
static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi";
+static const uint8_t kVendorCheckOriginal[] =
+ {
+ 0x74, 0x08, // jz short 08
+ 0x81, 0xFA, // cmp edx
+ 0x12, 0x0A, 0x00, 0x00 // Vendor CSR
+ };
+
+ static const uint8_t kVendorCheckPatched[] =
+ {
+ 0xEB, 0x08, // jmp short 08
+ 0x81, 0xFA, // cmp edx
+ 0x12, 0x0A, 0x00, 0x00 // Vendor CSR
+ };
+
static const char *blueToolPath = "/usr/sbin/BlueTool";
+static const char *bluetoothdPath = "/usr/sbin/bluetoothd";
static mach_vm_address_t orig_cs_validate {};
@@ -71,9 +88,14 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o
char path[PATH_MAX];
int pathlen = PATH_MAX;
FunctionCast(patched_cs_validate_page, orig_cs_validate)(vp, pager, page_offset, data, validated_p, tainted_p, nx_p);
- if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) {
- searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
- }
+ if (vn_getpath(vp, path, &pathlen) == 0) {
+ if (UNLIKELY(strcmp(path, blueToolPath) == 0)) {
+ searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+ }
+ if (UNLIKELY(strcmp(path, bluetoothdPath) == 0)) {
+ searchAndPatch(data, PAGE_SIZE, path, kVendorCheckOriginal, kVendorCheckPatched);
+ }
+ }
}

Binary file not shown.

Binary file not shown.

BIN
payloads/Tools/ocvalidate-0.7.5 Executable file

Binary file not shown.

View File

@@ -22,13 +22,13 @@ class Constants:
# OpenCore Versioning # OpenCore Versioning
# https://github.com/acidanthera/OpenCorePkg # https://github.com/acidanthera/OpenCorePkg
self.opencore_commit = "bd3f7a1 - 10-04-2021" self.opencore_commit = "bd3f7a1 - 10-04-2021"
self.opencore_version = "0.7.4" self.opencore_version = "0.7.5"
# Kext Versioning # Kext Versioning
## Acidanthera ## Acidanthera
## https://github.com/acidanthera ## https://github.com/acidanthera
self.lilu_version = "1.5.6" # Lilu self.lilu_version = "1.5.6" # Lilu
self.whatevergreen_version = "1.5.4" # WhateverGreen self.whatevergreen_version = "1.5.5" # WhateverGreen
self.airportbcrmfixup_version = "2.1.3" # AirPortBrcmFixup self.airportbcrmfixup_version = "2.1.3" # AirPortBrcmFixup
self.nvmefix_version = "1.0.9" # NVMeFix self.nvmefix_version = "1.0.9" # NVMeFix
self.applealc_version = "1.6.3" # AppleALC self.applealc_version = "1.6.3" # AppleALC
@@ -37,7 +37,7 @@ class Constants:
self.featureunlock_version = "1.0.3" # FeatureUnlock self.featureunlock_version = "1.0.3" # FeatureUnlock
self.debugenhancer_version = "1.0.4" # DebugEnhancer self.debugenhancer_version = "1.0.4" # DebugEnhancer
self.cpufriend_version = "1.2.4" # CPUFriend self.cpufriend_version = "1.2.4" # CPUFriend
self.bluetool_version = "2.6.1" # BlueToolFixup self.bluetool_version = "2.6.1" # BlueToolFixup (BrcmPatchRAM)
self.cslvfixup_version = "2.6.1" # CSLVFixup self.cslvfixup_version = "2.6.1" # CSLVFixup
## Apple ## Apple
@@ -317,7 +317,7 @@ class Constants:
@property @property
def bluetool_path(self): def bluetool_path(self):
return self.payload_kexts_path / Path(f"Acidanthera/BlueToolFixup-v{self.bluetool_version}.zip") return self.payload_kexts_path / Path(f"Acidanthera/BlueToolFixup-v{self.bluetool_version}-{self.kext_variant}.zip")
@property @property
def cslvfixup_path(self): def cslvfixup_path(self):
@@ -455,7 +455,7 @@ class Constants:
@property @property
def ocvalidate_path(self): def ocvalidate_path(self):
return self.payload_path / Path("Tools/ocvalidate") return self.payload_path / Path(f"Tools/ocvalidate-{self.opencore_version}")
# Icons # Icons
@property @property