tests: Adjust ordering for adsb_soc extraction

Testing IMaH extraction on that module requires un-partitioning
the image, and doing that in proper order. This change alters
order so that adsb_soc exists as separate IMaH file when time
comes for its extraction.

Author: mefistotelis

tests/test_bin_partimg_extract1.py

@@ -233,7 +233,6 @@ def test_bin_bootimg_imah_v2_extract(capsys, modl_inp_dir, test_nth):
         "{}/*/*_1301-extr1/bootarea.img".format(modl_inp_dir),
         "{}/*/*_1301-extr1/loader.img".format(modl_inp_dir),
         "{}/*/*_1502-extr1/bootarea.img".format(modl_inp_dir),
-        "{}/*/*_1502-extr1/vendor-extr1/adsb/adsb_soc.img".format(modl_inp_dir),
         "{}/*/*_2607.bin".format(modl_inp_dir), # in ag500 and ag501, this module is a bootarea.img as well
         "{}/*/*_2801-extr1/bootarea.img".format(modl_inp_dir),
       ) ]) if os.path.isfile(fn)]
@@ -248,3 +247,38 @@ def test_bin_bootimg_imah_v2_extract(capsys, modl_inp_dir, test_nth):
         case_bin_bootimg_extract(img_inp_fn)
         capstdout, _ = capsys.readouterr()
     pass
+
+@pytest.mark.order(5) # must be run after test_bin_archives_imah_v2_nested_extract
+@pytest.mark.fw_imah_v2
+@pytest.mark.parametrize("modl_inp_dir,test_nth", [
+    ('out/pm320-matrice30',1,),
+    ('out/pm430-matrice300',1,),
+    ('out/wm170-fpv_racer',1,),
+    ('out/wm231-mavic_air_2',1,),
+    ('out/wm232-mavic_air_2s',1,),
+    ('out/wm260-mavic_pro_3',1,),
+    ('out/wm2605-mavic_3_classic',1,),
+    ('out/wm265e-mavic_pro_3_enterpr',1,),
+    ('out/wm265m-mavic_pro_3_mulspectr',1,),
+    ('out/wm265t-mavic_pro_3_thermal',1,),
+  ] )
+def test_bin_bootimg_imah_v2_nested_extract(capsys, modl_inp_dir, test_nth):
+    """ Test if boot images are extracting correctly, and prepare data for tests which use the extracted files.
+    """
+    if test_nth < 1:
+        pytest.skip("limited scope")
+
+    img_inp_filenames = [fn for fn in itertools.chain.from_iterable([ glob.glob(e, recursive=True) for e in (
+        # Some nested archives contain yet another set of boot images with IMaH encryption
+        "{}/*/*_0801-extr1/vendor-extr1/adsb/adsb_soc.img".format(modl_inp_dir),
+        "{}/*/*_0802-extr1/vendor-extr1/adsb/adsb_soc.img".format(modl_inp_dir),
+        "{}/*/*_1502-extr1/vendor-extr1/adsb/adsb_soc.img".format(modl_inp_dir),
+      ) ]) if os.path.isfile(fn)]
+
+    if len(img_inp_filenames) < 1:
+        pytest.skip("no package files to test in this directory")
+
+    for img_inp_fn in img_inp_filenames:
+        case_bin_bootimg_extract(img_inp_fn)
+        capstdout, _ = capsys.readouterr()
+    pass

tests/test_dji_flyc_param_ed1.py

@@ -713,7 +713,7 @@ def test_dji_flyc_param_ed_imah_v1_ckmod(capsys, modl_inp_dir, test_nth):
     pass
 
 
-@pytest.mark.order(6) # must be run after test_dji_mvfc_fwpak_imah_v2_rebin and test_dji_imah_fwsig_v2_nested_rebin
+@pytest.mark.order(7) # must be run after test_dji_mvfc_fwpak_imah_v2_rebin and test_dji_imah_fwsig_v2_nested_rebin
 @pytest.mark.fw_imah_v2
 @pytest.mark.parametrize("modl_inp_dir,test_nth", [
     ('out/ag500-agras_t10',1,),

tests/test_dji_imah_fwsig_rebin1.py

@@ -288,8 +288,11 @@ def get_params_for_dji_imah_fwsig(modl_inp_fn):
             module_changes_limit = 2 + 256
     elif (m := re.match(r'^.*/(rc-n1-wm260)([._].*)?[.](bin|cfg|enc|fw|img|sig|ta|txt)$', modl_inp_fn, re.IGNORECASE)):
         platform = m.group(1)
-        if False:
-            pass # no quirks
+        # specific nested modules
+        if (re.match(r'^.*{:s}_1502_[^/]*[.]fw_1502.*adsb_soc.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
+            module_cmdopts = "-k PRAK-2020-04 -k TBIE-9999-99 -f" # TBIE not published, forcing extract encrypted
+            # allow change of 2 bytes from auth key name, 4+4 from enc+dec checksum, 256 from signature, up to 11x16 chunk padding, 32 payload digest
+            module_changes_limit = 2 + 4 + 4 + 256 + 11*16 + 32
         else: # if first level module or nested within m1301
             module_cmdopts = "-k PRAK-2018-01 -k TBIE-2020-04"
             # allow change of 2 bytes from auth key name, 256 from signature, up to 16 chunk padding
@@ -356,6 +359,11 @@ def get_params_for_dji_imah_fwsig(modl_inp_fn):
             module_cmdopts = "-k PRAK-2018-01 -k TBIE-2020-04"
             # allow change of 2 bytes from auth key name, 4+4 from enc+dec checksum, 256 from signature, up to 11x16 chunk padding, 32 payload digest
             module_changes_limit = 2 + 4 + 4 + 256 + 11*16 + 32
+        # specific nested modules
+        elif (re.match(r'^.*{:s}_0801_[^/]*[.]fw_0801.*adsb_soc.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
+            module_cmdopts = "-k PRAK-2020-04 -k TBIE-9999-99 -f" # TBIE not published, forcing extract encrypted
+            # allow change of 2 bytes from auth key name, 4+4 from enc+dec checksum, 256 from signature, up to 11x16 chunk padding, 32 payload digest
+            module_changes_limit = 2 + 4 + 4 + 256 + 11*16 + 32
         # remaining nested modules
         elif (re.match(r'^.*{:s}_0701_[^/]*[.]fw_0701.*$'.format(platform), modl_inp_fn, re.IGNORECASE) or
           re.match(r'^.*{:s}_0801_[^/]*[.]fw_0801.*$'.format(platform), modl_inp_fn, re.IGNORECASE) or
@@ -369,8 +377,13 @@ def get_params_for_dji_imah_fwsig(modl_inp_fn):
             module_changes_limit = 2 + 4 + 256
     elif (m := re.match(r'^.*/(wm170|wm232|gl170|pm430|ag500)([._].*)?[.](bin|cfg|enc|fw|img|sig|ta|txt)$', modl_inp_fn, re.IGNORECASE)):
         platform = m.group(1)
-        # nested modules
-        if (re.match(r'^.*{:s}_0701_[^/]*[.]fw_0701.*$'.format(platform), modl_inp_fn, re.IGNORECASE) or
+        # specific nested modules
+        if (re.match(r'^.*{:s}_0801_[^/]*[.]fw_0801.*adsb_soc.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
+            module_cmdopts = "-k PRAK-2020-04 -k TBIE-9999-99 -f" # TBIE not published, forcing extract encrypted
+            # allow change of 2 bytes from auth key name, 4+4 from enc+dec checksum, 256 from signature, up to 11x16 chunk padding, 32 payload digest
+            module_changes_limit = 2 + 4 + 4 + 256 + 11*16 + 32
+        # remaining nested modules
+        elif (re.match(r'^.*{:s}_0701_[^/]*[.]fw_0701.*$'.format(platform), modl_inp_fn, re.IGNORECASE) or
           re.match(r'^.*{:s}_0801_[^/]*[.]fw_0801.*$'.format(platform), modl_inp_fn, re.IGNORECASE) or
           re.match(r'^.*{:s}_0802_[^/]*[.]fw_0802.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
             module_cmdopts = "-k PRAK-2020-01 -k TBIE-2020-02"
@@ -622,7 +635,12 @@ def get_params_for_dji_imah_fwsig(modl_inp_fn):
     elif (m := re.match(r'^.*/(wm260|wm2605)([.][a-z]*|[_][0-9]{4}.*)?[.](bin|cfg|enc|fw|img|sig|ta|txt)$', modl_inp_fn, re.IGNORECASE)):
         platform = m.group(1)
         # specific nested modules
-        if (re.match(r'^.*{:s}_1502_[^/]*[.]fw_1502.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
+        if (re.match(r'^.*{:s}_1502_[^/]*[.]fw_1502.*adsb_soc.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
+            module_cmdopts = "-k PRAK-2020-04 -k TBIE-9999-99 -f" # TBIE not published, forcing extract encrypted
+            # allow change of 2 bytes from auth key name, 4+4 from enc+dec checksum, 256 from signature, up to 11x16 chunk padding, 32 payload digest
+            module_changes_limit = 2 + 4 + 4 + 256 + 11*16 + 32
+        # specific nested modules
+        elif (re.match(r'^.*{:s}_1502_[^/]*[.]fw_1502.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
             module_cmdopts = "-k PRAK-2020-01 -k TBIE-2020-02"
             # allow change of 2 bytes from auth key name, 4+4 from enc+dec checksum, 256 from signature, up to 9x16 chunk padding, 32 payload digest, 6x16 unknown additional
             module_changes_limit = 2 + 4 + 4 + 256 + 9*16 + 32 + 6*16
@@ -937,7 +955,7 @@ def test_dji_imah_fwsig_v2_rebin(capsys, cmdargs, pkg_inp_dir, test_nth):
     pass
 
 
-@pytest.mark.order(5) # must be run after test_bin_archives_imah_v2_extract, test_bin_bootimg_imah_v2_extract, test_bin_archives_imah_v2_nested_extract
+@pytest.mark.order(6) # must be run after test_bin_archives_imah_v2_extract, test_bin_bootimg_imah_v2_extract, test_bin_archives_imah_v2_nested_extract, test_bin_bootimg_imah_v2_nested_extract
 @pytest.mark.fw_imah_v2
 @pytest.mark.parametrize("modl_inp_dir,test_nth", [
     ('out/ac103-osmo_action_2',1,),
@@ -1006,6 +1024,7 @@ def test_dji_imah_fwsig_v2_nested_rebin(capsys, cmdargs, modl_inp_dir, test_nth)
         "{}/*/*-loader_p*.img.sig".format(modl_inp_dir),
         "{}/*/*-unpack_p*.img.sig".format(modl_inp_dir),
         "{}/*/*-part_p*.img.sig".format(modl_inp_dir),
+        # output from test_bin_bootimg_imah_v2_nested_extract
         "{}/*/*-adsb_soc_p*.img.sig".format(modl_inp_dir),
         # output from test_bin_archives_imah_v2_nested_extract
         "{}/*/*-extr1/vendor-extr1/ta/*-*-*0.ta".format(modl_inp_dir),