apple-data 1.0.422 → 1.0.428

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3f5953ceb477992724375b9afb088ac338bd5ab72a2d8b89d1e7d758957d75
-  data.tar.gz: 1c324833e1b6941254c418c29c86b3b7129a6ea16caae051e3b746e25e464591
+  metadata.gz: 92c4253c79e5f7b5db63749487660a069ff5cd6b86dbf1ece90d9f153372a36d
+  data.tar.gz: 9aaf9fda61597b426a73050fa99a632513c20390228f511495d1bafae69bb41d
 SHA512:
-  metadata.gz: 2120bd046e1b4553fe4ef53460dc847aaef41325ea016aeee0e902865a599c7044799d4ca03e119de1a55be4d85a164df448eab927f68afab81a7a8f7011216d
-  data.tar.gz: 74ee9d8a091b53c1ffb73e9e2d57415fba216edacc08f34989c402698461d4033719065af574e008f823408c28f9297283760c089b6e309c57f05805d8551661
+  metadata.gz: 5aefa0146a25367e9ade5f20da0a3cf6ac3e098fc80ccf3494dc5fa3a61943ed3280045cd61edcc79f5478e78f2a248da90889115f457a505c14b358347ca260
+  data.tar.gz: 569e2347fd580466273443b6a3e4d9924fd36ab8a55c0bce0ec0870fd4f277ab157ddfde77760769a811ec8775aa7afdf899275ae5fda215c84e57fb544237ec

data/lib/apple_data/keybag.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module AppleData
+  # Represents a GID grouping of encrypted and decrypted keybags
+  class GIDKeyBag < DataFile
+    @keybags = {}
+    cattr_reader :keybags
+
+    class << self
+      def new(chip_id)
+        self.[](chip_id)
+      end
+
+      def save_all
+        @keybags.each do |_key, keybag|
+          keybag.save
+        end
+      end
+
+      def [](chip_id)
+        chip_id = chip_id.to_i
+        return @keybags[chip_id] if @keybags.key? chip_id
+
+        instance = allocate
+        instance.send(:initialize, chip_id)
+        @keybags[chip_id] = instance
+      end
+    end
+
+    def initialize(chip_id)
+      super('keybags', chip_id.to_s)
+    end
+
+    def get_board(board_id)
+      board_id = board_id.to_i
+      BoardKeyBag.new self, board_id, collection(:keybag_boards).ensure_key(board_id, description: false)
+    end
+
+    # A keybag of builds for a particular build
+    class BoardKeyBag
+      def initialize(gid_keybag, board_id, board)
+        @keybag = gid_keybag
+        @board_id = board_id
+        @board = board
+      end
+
+      def merge_keydb_build(build_id, build)
+        return unless build['keybags']
+
+        @board[build_id] ||= {}
+        @board[build_id]['components'] ||= {}
+        @board[build_id]['components'].reverse_merge! build['keybags']
+      end
+    end
+  end
+end

data/lib/apple_data/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppleData
-  VERSION = '1.0.422'
+  VERSION = '1.0.428'
 end

data/share/4cc.yaml

@@ -139,11 +139,11 @@ codes:
     description: Graphics Firmware
     usage:
     - Firmware
-  ibdt:
+  iBootData:
     description: iBoot Data
     usage:
     - Firmware
-  ibot:
+  iBoot:
     description: iBoot
     usage:
     - Firmware

data/share/firmware.yaml

@@ -3,29 +3,33 @@ metadata:
   description: Listing of known firmware types included in a restore package
   credits:
 firmware_types:
-  ACIBTFirmware:
-  ACIWiFiFirmware:
-  ADCPetra:
   ANE:
+    description: Apple Neural Engine
     type: anef
-  ANSF:
+  ANS:
     description: Apple NAND Storage
     type: ansf
+    tipw_key_name: ANSF
   AOP:
     description:
-    type:
+    type: aopf
+    tipw_key_name: AOPFirmware
     filenames:
     - aopfw.im4p
     - aopfw-s8000aop.im4p
     - aopfw-ipad6faop.im4p
     - aopfw-ipad7aop.im4p
-  AOPFirmware:
-    type: aopf
-  AppleAVE:
-    type: avef
+  Ap,HapticAssets:
+    description:
+    type:
+    tipw_key_name: HapticAssets
+  Ap,Scorpius:
+    description:
+    type:
+    tipw_key_name: MConnector
   AppleLogo:
     type: logo
-    description:
+    description: The Apple Logo
     filenames:
     - applelogo@2x~iphone.s5l8950x.img3
     - applelogo@2x~iphone.s8003.im4p
@@ -40,6 +44,7 @@ firmware_types:
     - applelogo@3x~iphone.s8000.im4p
     - applelogo@2x~iphone.t7000.im4p
     - applelogo@2x~ipad.s8000.im4p
+    - applelogo@2x~ipad.s8000.im4p
     - applelogo@2x~ipad.s8003.im4p
     - applelogo~appletv.im4p
     - applelogo@2732~ipad.im4p
@@ -47,12 +52,18 @@ firmware_types:
     - applelogo@2732~ipad.t8011.im4p
     - applelogo@2224~ipad.t8011.im4p
   AppleMaggie:
+    description:
     type: magg
-  ARMFW:
   AudioCodecFirmware:
-  BasebandFirmware:
     description:
     type:
+  AVE:
+    description: Audio/Video Encryption
+    type: avef
+    tipw_key_name: AppleAVE
+  BasebandFirmware:
+    description: Baseband (Radios)
+    type: bbfw
     filenames:
     - Mav5-11.51.00.Release.bbfw
     - Mav7Mav8-7.51.00.Release.bbfw
@@ -259,11 +270,10 @@ firmware_types:
     - glyphplugin@2224~ipad-lightning.im4p
     - glyphplugin@2732~ipad-lightning.t8011.im4p
     - glyphplugin@2224~ipad-lightning.t8011.im4p
-  Dali:
-  DCP:
+
   DeviceTree:
+    description: Normal mode device tree
     type: dtre
-    description:
     filenames:
     - DeviceTree.n42ap.img3
     - DeviceTree.n49ap.img3
@@ -308,15 +318,15 @@ firmware_types:
   ftap:
     description:
     type:
-    filenames: []
   ftsp:
     description:
     type:
-    filenames: []
-  GlyphCharging:
-  GlyphPlugin:
-  HapticAssets:
+  GFX:
+    description: Graphics Firmware
+    type:
+    tipw_key_name: ARMFW
   Homer:
+    description:
     type: homr
   iBEC:
     description: iBoot Epoch Change
@@ -413,7 +423,8 @@ firmware_types:
     - iBSS.j207.RELEASE.im4p
   KernelCache:
     description:
-    type:
+    type: krnl
+    tipw_key_name: Kernelcache
     filenames:
     - kernelcache.release.iphone5
     - kernelcache.release.iphone5b
@@ -440,9 +451,10 @@ firmware_types:
     - kernelcache.release.n102
     - kernelcache.release.j42d
     - kernelcache.release.ipad7
-  Kernelcache:
-  LeapHaptics:
-  LiquidDetect:
+  Liquid:
+    description:
+    type:
+    tipw_key_name: LiquidDetect
   LLB:
     description: Low Level Boot (iBoot)
     type: illb
@@ -473,14 +485,18 @@ firmware_types:
     - LLB.j42d.RELEASE.im4p
     - LLB.j120.RELEASE.im4p
     - LLB.j207.RELEASE.im4p
-  LowPowerFindMyMode:
-  LowPowerMode:
-  MConnector:
-  Multitouch:
-  NeedService:
+  LowPowerWallet0:
+    description:
+    type:
+    tipw_key_name: LowPowerMode
+  LowPowerWallet1:
+    description:
+    type:
+    tipw_key_name: LowPowerFindMyMode
   OS:
     description:
     type:
+    tipw_key_name: RootFS
     filenames:
     - '058-73953-011.dmg'
     - '058-74314-014.dmg'
@@ -868,8 +884,6 @@ firmware_types:
     - '058-88752-046.dmg'
     - '058-88752-045.dmg'
     - '058-88752-043.dmg'
-  PMP:
-  RANS:
   RecoveryMode:
     description:
     type:
@@ -897,6 +911,10 @@ firmware_types:
     - recoverymode@2224~ipad-lightning.im4p
     - recoverymode@2732~ipad-lightning.t8011.im4p
     - recoverymode@2224~ipad-lightning.t8011.im4p
+  RestoreANS:
+    description: Restore Apple NAND Storage
+    type: rans
+    tipw_key_name: RANS
   RestoreDeviceTree:
     description:
     type:
@@ -996,6 +1014,7 @@ firmware_types:
   RestoreRamDisk:
     description:
     type:
+    tipw_key_name: RestoreRamdisk
     filenames:
     - '058-68591-063.dmg'
     - '058-68402-063.dmg'
@@ -1187,10 +1206,9 @@ firmware_types:
     - '058-85048-098.dmg'
     - '058-70513-087.dmg'
     - '058-70359-087.dmg'
-  RestoreRamdisk:
   RestoreSEP:
     description:
-    type:
+    type: rsep
     filenames:
     - sep-firmware.n69.RELEASE.im4p
     - sep-firmware.n53.RELEASE.im4p
@@ -1239,11 +1257,10 @@ firmware_types:
     description:
     type:
     filenames: []
-  RootFS:
-  RTPFirmware:
   SEP:
-    description:
-    type:
+    description: Secure Enclave Processor firmware (SEPOS)
+    type: sepi
+    tipw_key_name: SEPFirmware
     filenames:
     - sep-firmware.n69.RELEASE.im4p
     - sep-firmware.n53.RELEASE.im4p
@@ -1278,16 +1295,14 @@ firmware_types:
     - sep-firmware.j121.RELEASE.im4p
     - sep-firmware.j207.RELEASE.im4p
     - sep-firmware.j208.RELEASE.im4p
-  SEPFirmware:
-    description: Secure Enclave Processor firmware (SEPOS)
-    type: sepi
-  SmartIOFirmware:
+  SIO:
+    description: SmartIO Firmware (iPad smart-case)
     type: siof
+    tipw_key_name: SmartIOFirmware
   StaticTrustCache:
     description:
     type:
     filenames:
     - '048-95869-019.dmg.trustcache'
-  UpdateRamdisk:
-  UpdateRamdiskOTA:
-  WirelessPower:
+  WCHFirmwareUpdater:
+    tipw_key_name: WirelessPower

data/share/img4.yaml

@@ -191,15 +191,15 @@ img4_tags:
     description:
   hypr:
     description:
-  ibec:
+  iBEC:
     description:
-  ibot:
+  iBoot:
     description:
-  ibss:
+  iBSS:
     description:
   ienv:
     description:
-  illb:
+  LLB:
     description:
   IM4M:
     description:

data/share/kext.yaml

@@ -939,7 +939,7 @@ kexts:
     description:
     collections:
     - BootKernelExtensions.kc
-  com.apple.driver.usb.AppleUSBHostBillboardDevice:
+  com.apple.driver.usb.AppleUSBHostBLLB:oardDevice:
     description:
     collections:
     - BootKernelExtensions.kc