Run a virtual iPhone on an Apple Silicon Mac.
Swift
patcher: Adapt AVPBooter and IBoot to match macOS 27 beta 3+
Kila2f92d82cd754d
diff --git a/sources/FirmwarePatcher/AVPBooter/AVPBooterPatcher.swift b/sources/FirmwarePatcher/AVPBooter/AVPBooterPatcher.swiftindex 37d571a5..06472b96 100644--- a/sources/FirmwarePatcher/AVPBooter/AVPBooterPatcher.swift+++ b/sources/FirmwarePatcher/AVPBooter/AVPBooterPatcher.swift@@ -74,9 +74,13 @@ public final class AVPBooterPatcher: Patcher {throw PatcherError.invalidFormat("AVPBooter: disassembly produced no instructions")}- // Step 1 — locate the first instruction that references the DGST constant.+ // Step 1 — locate the first movz/movk instruction that loads the DGST constant.+ // Only match immediate-loading mnemonics to avoid false positives from branch+ // targets whose address happens to contain "4447" (e.g. `bl #0x4447c`).guard let hitIdx = insns.firstIndex(where: { insn in- "\(insn.mnemonic) \(insn.operandString)".contains(Self.dgstSearch)+ let mn = insn.mnemonic+ guard mn == "movz" || mn == "movk" || mn == "mov" else { return false }+ return insn.operandString.contains(Self.dgstSearch)}) else {throw PatcherError.patchSiteNotFound("AVPBooter DGST: constant 0x4447 not found in binary")}diff --git a/sources/FirmwarePatcher/IBoot/IBootJBPatcher.swift b/sources/FirmwarePatcher/IBoot/IBootJBPatcher.swiftindex e142352a..9561c3f3 100644--- a/sources/FirmwarePatcher/IBoot/IBootJBPatcher.swift+++ b/sources/FirmwarePatcher/IBoot/IBootJBPatcher.swift@@ -32,9 +32,11 @@ public final class IBootJBPatcher: IBootPatcher {}// Collect all ADRP+ADD sites that reference any "boot-nonce" occurrence.+ // Allow a small negative delta (up to 16 bytes before the string) because+ // code may reference the containing structure rather than the string itself.var addOffsets: [Int] = []for strOff in stringOffsets {- let refs = findRefsToOffset(strOff)+ let refs = findRefsNear(strOff, tolerance: 16)for (_, addOff) in refs {addOffsets.append(addOff)}@@ -136,6 +138,55 @@ public final class IBootJBPatcher: IBootPatcher {// MARK: - Reference Search Helpers+ /// Find all ADRP+ADD pairs that point within `tolerance` bytes before `targetOff`.+ ///+ /// This handles the common case where code references a structure header+ /// a few bytes before the actual string (e.g. a length-prefixed property).+ private func findRefsNear(_ targetOff: Int, tolerance: Int) -> [(adrpOff: Int, addOff: Int)] {+ let data = buffer.data+ let size = buffer.count+ var refs: [(Int, Int)] = []++ var off = 0+ while off + 8 <= size {+ guard+ let a = disasm.disassembleOne(in: data, at: off),+ let b = disasm.disassembleOne(in: data, at: off + 4)+ else {+ off += 4+ continue+ }++ guard+ a.mnemonic == "adrp",+ b.mnemonic == "add",+ let detA = a.aarch64,+ let detB = b.aarch64,+ detA.operands.count >= 2,+ detB.operands.count >= 3,+ detA.operands[0].reg.rawValue == detB.operands[1].reg.rawValue,+ detA.operands[1].type == AARCH64_OP_IMM,+ detB.operands[2].type == AARCH64_OP_IMM+ else {+ off += 4+ continue+ }++ let pageAddr = detA.operands[1].imm+ let addImm = detB.operands[2].imm+ let computed = Int(pageAddr + addImm)+ let delta = targetOff - computed++ if delta >= 0, delta <= tolerance {+ refs.append((off, off + 4))+ }++ off += 4+ }++ return refs+ }+/// Find all ADRP+ADD pairs in the binary that point to `targetOff`.////// Scans the entire buffer in 4-byte steps, checking consecutive instruction