pymobiledevice3 4.26.3__py3-none-any.whl → 4.26.5__py3-none-any.whl

pymobiledevice3/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.26.3'
-__version_tuple__ = version_tuple = (4, 26, 3)
+__version__ = version = '4.26.5'
+__version_tuple__ = version_tuple = (4, 26, 5)
 
 __commit_id__ = commit_id = None

pymobiledevice3/cli/cli_common.py

@@ -288,7 +288,7 @@ class RSDCommand(BaseServiceProviderCommand):
         if udid != '':
             try:
                 # Connect to the specified device
-                self.service_provider = [rsd for rsd in rsds if rsd.udid == udid][0]
+                self.service_provider = [rsd for rsd in rsds if rsd.udid == udid or rsd.udid.replace('-', '') == udid][0]
             except IndexError:
                 raise DeviceNotFoundError(udid)
         else:

pymobiledevice3/restore/img4.py

@@ -31,6 +31,7 @@ COMPONENT_FOURCC = {
     'Ap,RestoreANE2': 'ran2',
     'Ap,RestoreANE3': 'ran3',
     'Ap,RestoreCIO': 'rcio',
+    'Ap,RestoreDCP2': 'rdc2',
     'Ap,RestoreTMU': 'rtmu',
     'Ap,Scorpius': 'scpf',
     'Ap,SystemVolumeCanonicalMetadata': 'msys',
@@ -132,14 +133,17 @@ def stitch_component(name: str, im4p_data: bytes, tss: dict, build_identity: Bui
     if fourcc is not None:
         im4p.fourcc = fourcc
 
-    # hack if we have a *-TBM entry for the give
+    # check if we have a *-TBM entry for the given component
     tbm_dict = tss.get(f'{name}-TBM')
 
+    info = build_identity['Info']
+    nonce_slot_required = info.get('RequiresNonceSlot', False) and name in ('SEP', 'SepStage1', 'LLB')
+
     im4r = None
-    if tbm_dict is not None:
+    if tbm_dict is not None or nonce_slot_required:
         im4r = IM4R()
-        info = build_identity['Info']
-        if info.get('RequiresNonceSlot', False) and name in ('SEP', 'SepStage1', 'LLB'):
+
+        if nonce_slot_required:
             logger.debug(f'{name}: RequiresNonceSlot for {name}')
             if name in ('SEP', 'SepStage1'):
                 snid = ap_parameters.get('SepNonceSlotID', info.get('SepNonceSlotID', 2))
@@ -154,6 +158,7 @@ def stitch_component(name: str, im4p_data: bytes, tss: dict, build_identity: Bui
                     RestoreProperty(fourcc='anid', value=anid)
                 )
 
+    if tbm_dict is not None:
         for key in tbm_dict.keys():
             logger.debug(f'{name}: Adding property {key}')
             im4r.add_property(RestoreProperty(fourcc=key, value=tbm_dict[key]))

pymobiledevice3/restore/recovery.py

@@ -80,9 +80,10 @@ class Recovery(BaseRestore):
         tss.add_common_tags(parameters)
         tss.add_ap_tags(parameters)
 
-        build_manifest_info = self.build_identity['Info']
-        for manifest_property in build_manifest_info.get('RequestManifestProperties', []):
-            tss.add_tags({manifest_property: build_manifest_info[manifest_property]})
+        # TODO: This break updating iPhone 15P Pro. Consider re-adding it once we figure out what went wrong
+        # build_manifest_info = self.build_identity['Info']
+        # for manifest_property in build_manifest_info.get('RequestManifestProperties', []):
+        #     tss.add_tags({manifest_property: build_manifest_info[manifest_property]})
 
         # add personalized parameters
         if self.device.is_image4_supported:
@@ -344,10 +345,10 @@ class Recovery(BaseRestore):
         self.device.irecv.set_autoboot(enable)
 
     def enter_restore(self):
-        if self.ipsw.build_manifest.build_major >= 8:
-            self.restore_boot_args = 'rd=md0 nand-enable-reformat=1 -progress'
-        elif self.macos_variant:
+        if self.macos_variant:
             self.restore_boot_args = 'rd=md0 nand-enable-reformat=1 -progress -restore'
+        elif self.ipsw.build_manifest.build_major >= 8:
+            self.restore_boot_args = 'rd=md0 nand-enable-reformat=1 -progress'
 
         # upload data to make device boot restore mode
 

pymobiledevice3/restore/restore.py

@@ -701,7 +701,7 @@ class Restore(BaseRestore):
 
         if chip_id == 0x20211:
             comp_name = 'SE,Firmware'
-        elif chip_id in (0x73, 0x64, 0xC8, 0xD2, 0x2c, 0x36):
+        elif chip_id in (0x73, 0x64, 0xC8, 0xD2, 0x2c, 0x36, 0x37):
             comp_name = 'SE,UpdatePayload'
         else:
             self.logger.warning(f'Unknown SE,ChipID {chip_id} detected. Restore might fail.')

pymobiledevice3/restore/tss.py

@@ -14,7 +14,7 @@ from pymobiledevice3.utils import bytes_to_uint, plist_access_path
 
 TSS_CONTROLLER_ACTION_URL = 'http://gs.apple.com/TSS/controller?action=2'
 
-TSS_CLIENT_VERSION_STRING = 'libauthinstall-1033.80.3'
+TSS_CLIENT_VERSION_STRING = 'libauthinstall-1104.0.9'
 
 logger = logging.getLogger(__name__)
 

{pymobiledevice3-4.26.3.dist-info → pymobiledevice3-4.26.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.26.3
+Version: 4.26.5
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>

{pymobiledevice3-4.26.3.dist-info → pymobiledevice3-4.26.5.dist-info}/RECORD

@@ -8,7 +8,7 @@ misc/understanding_idevice_protocol_layers.md,sha256=8tEqRXWOUPoxOJLZVh7C7H9JGCh
 misc/usbmux_sniff.sh,sha256=iWtbucOEQ9_UEFXk9x-2VNt48Jg5zrPsnUbZ_LfZxwA,212
 pymobiledevice3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/__main__.py,sha256=tBERBLftc5ENGB4NQfNJRIecok0LQfNvkqXlsi1feFw,11572
-pymobiledevice3/_version.py,sha256=pCfjK9_ghujjugHtMtYVQlFLGXgDd6tnrDePi2lFIRk,706
+pymobiledevice3/_version.py,sha256=tktWF2Uc_i5Wvc6Xa6yZWQVTAr1hYBz5fNmMVt1CPeY,706
 pymobiledevice3/bonjour.py,sha256=-Q_TLBGJ6qW3CX_DgBcz-CXfWSwxWVQ2L64hk6PxnDY,5631
 pymobiledevice3/ca.py,sha256=mTvWdSjTZw6Eb-22-IZ323GyA1G6CXYmdPedImTjm3A,10542
 pymobiledevice3/common.py,sha256=-PG6oaUkNFlB3jb7E0finMrX8wqhkS-cuTAfmLvZUmc,329
@@ -29,7 +29,7 @@ pymobiledevice3/cli/amfi.py,sha256=6hlqKrKOFj0secUnLQ8grDDnnh3fRsO6x_vo40oy22w,9
 pymobiledevice3/cli/apps.py,sha256=LH75A1gDRGP0nWO4QFcOUDg0EdphkGuYnWJgIQHrIBg,3859
 pymobiledevice3/cli/backup.py,sha256=SyHojiRRguxdkAPMz_Rp_9-zJNeuOtmpa0imdPN12-4,6691
 pymobiledevice3/cli/bonjour.py,sha256=qWFH05BZ-FlnSilVP0PMzPUidfBs5LPdepMhPyIliFE,2806
-pymobiledevice3/cli/cli_common.py,sha256=i51C8Y4ST_BqUMBvwuoLanGDJZ-rZS6GsxX6OYqsPd0,12908
+pymobiledevice3/cli/cli_common.py,sha256=lQFhkTwPfi1UYFkMiDc-jrId2s2yHwzF5lFTK0dXM_s,12945
 pymobiledevice3/cli/companion_proxy.py,sha256=ey0X3moJ49zVJoNCpRMMHmf9fBZfdqimhz2VCA35oII,581
 pymobiledevice3/cli/completions.py,sha256=t8oryezQTcWDno_E2Cch7o1f-qURVL9M1Z4o6uLA_kM,1722
 pymobiledevice3/cli/crash.py,sha256=m1vs0_KUy4cxu8vHYjn7olay8oPQGTFZqMCHspnGpVs,3181
@@ -90,12 +90,12 @@ pymobiledevice3/restore/consts.py,sha256=C4HheYOFbalRNPGsfc0DRr3ogo7RYQachUslVlO
 pymobiledevice3/restore/device.py,sha256=TZahPSKHxfrF7A8DC70fwcoQK9bXD6QV1dAr80YAgmw,2710
 pymobiledevice3/restore/fdr.py,sha256=KOXZH50oNYseP-PzSkw_uxu1NyGP5d32_DYSoYdbFu8,6269
 pymobiledevice3/restore/ftab.py,sha256=SWNKZRN1pFWzx_qHCkycvsLaHFAqkqQJYRBJYQ_-Wjw,1507
-pymobiledevice3/restore/img4.py,sha256=qkygkcul1RAXoBVMSAb8uKI4IUORrfCjsALp26NXyrk,4750
-pymobiledevice3/restore/recovery.py,sha256=YB2wZST3uhQMO1DwewfHb2VdEb-gH8nW58RbTmHIhZE,17090
-pymobiledevice3/restore/restore.py,sha256=GE86M79jd6nnd5GyY4ZLiEyhMKe0GxLTKe_bDcqtpJg,57479
+pymobiledevice3/restore/img4.py,sha256=V03nq1L7FMkdmC15MN7W9Wct4MQx472aDpy5IkuNvII,4888
+pymobiledevice3/restore/recovery.py,sha256=1eHQ-I1iJG31TLIAz890fBtGqopBQT3FB--UYESIkEQ,17205
+pymobiledevice3/restore/restore.py,sha256=86qTivTKuYT0cwWcYPoRtLKvsFvPoiUyKtq_9YWjXw0,57485
 pymobiledevice3/restore/restore_options.py,sha256=qeh_wRa_bi0Ccl0p0JuX9EChEQBqwJt94EBImWcEJ3E,7255
 pymobiledevice3/restore/restored_client.py,sha256=h_yBZ_e1wfaIzi0f9-R8Ky2x6xFTkvDlpWIV561uxoU,3638
-pymobiledevice3/restore/tss.py,sha256=egguhU3aVt8yWba-MFa2aoL999bn61kty8ON0QcTKoE,29853
+pymobiledevice3/restore/tss.py,sha256=QHq5OTyCn7iIrYhhgOxT5_gpV7wggcy5Faje5160FHQ,29852
 pymobiledevice3/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/services/accessibilityaudit.py,sha256=PtQujwFLL3E1OgOSUjkKHvgmk2e8Ij2XZIp8JicAphs,15547
 pymobiledevice3/services/afc.py,sha256=9Ddc0emUrwLPOi0DLy1MZ5w7zqotYNxBB2OU0WyIWsk,36244
@@ -164,9 +164,9 @@ pymobiledevice3/services/web_protocol/switch_to.py,sha256=hDddJUEePbRN-8xlllOeGh
 pymobiledevice3/tunneld/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/tunneld/api.py,sha256=EfGKXEWhsMSB__menPmRmL9R6dpazVJDUy7B3pn05MM,2357
 pymobiledevice3/tunneld/server.py,sha256=SvC57AV_R8YQhA0fCwGNUdhfy8TKMFWwL_fp_FmXrBI,22715
-pymobiledevice3-4.26.3.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-pymobiledevice3-4.26.3.dist-info/METADATA,sha256=rod9BxYNBcX_9scPwLDKytmvF9P1lsiHPhIYQ64WkYg,17463
-pymobiledevice3-4.26.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymobiledevice3-4.26.3.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
-pymobiledevice3-4.26.3.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
-pymobiledevice3-4.26.3.dist-info/RECORD,,
+pymobiledevice3-4.26.5.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+pymobiledevice3-4.26.5.dist-info/METADATA,sha256=oBIsXTxeVzRXEPBnyAW1a3jidnWN8f5bbM2QrjRVn5c,17463
+pymobiledevice3-4.26.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymobiledevice3-4.26.5.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
+pymobiledevice3-4.26.5.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
+pymobiledevice3-4.26.5.dist-info/RECORD,,