tests: Adjust for Mavic 3 keys being published

Author: mefistotelis

tests/test_bin_partimg_extract1.py

@@ -214,6 +214,9 @@ def test_bin_bootimg_imah_v1_extract(capsys, modl_inp_dir, test_nth):
     ('out/wm247-mavic_2_enterpr_rtk',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_extract(capsys, modl_inp_dir, test_nth):
     """ Test if boot images are extracting correctly, and prepare data for tests which use the extracted files.

tests/test_bin_sparseimg_solidify1.py

@@ -108,6 +108,9 @@ def case_bin_sparseimg_solidify(img_inp_fn):
     ('out/wm247-mavic_2_enterpr_rtk',1,),
     ('out/wm2605-mavic_3_classic',1,),
     ('out/wm260-mavic_pro_3',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_sparseimg_imah_v2_solidify(capsys, modl_inp_dir, test_nth):
     """ Solidify sparse images so that they can be later extracted.

tests/test_dji_imah_fwsig_rebin1.py

@@ -522,11 +522,11 @@ def get_params_for_dji_imah_fwsig(modl_inp_fn):
         platform = m.group(1)
         # specific first level modules
         if (re.match(r'^.*{:s}_1502_[^/]*[.]fw[.]sig$'.format(platform), modl_inp_fn, re.IGNORECASE)): # the module uses 2048-bit PRAK
-            module_cmdopts = "-k PRAK-9999-99 -k UFIE-9999-99 -f" # UFIE not published, forcing extract encrypted
+            module_cmdopts = "-k PRAK-2020-01 -k UFIE-2020-04"
             # allow change of 2 bytes from auth key name, 256+16 from signature, up to 3x16 chunk padding
             module_changes_limit = 2 + 256 + 16 + 3*16
         else: # if first level module
-            module_cmdopts = "-k PRAK-9999-98 -k UFIE-9999-99 -f" # UFIE not published, forcing extract encrypted
+            module_cmdopts = "-k PRAK-2021-09 -k UFIE-2021-08"
             # allow change of 2 bytes from auth key name, 384+32 from signature, up to 3x16 chunk padding
             module_changes_limit = 2 + 384 + 32 + 3*16
     elif (m := re.match(r'^.*/(wm240|wm245|wm246)([._].*)?[.](bin|cfg|enc|fw|img|sig|ta|txt)$', modl_inp_fn, re.IGNORECASE)):
@@ -580,12 +580,12 @@ def get_params_for_dji_imah_fwsig(modl_inp_fn):
             module_changes_limit = 2 + 4 + 4 + 256 + 9*16 + 32 + 6*16
         # specific nested modules
         elif (re.match(r'^.*{:s}_0802_[^/]*[.]fw_0802.*$'.format(platform), modl_inp_fn, re.IGNORECASE)):
-            module_cmdopts = "-k PRAK-2021-09 -k TBIE-2021-08" # first level key is not published, making this unused
+            module_cmdopts = "-k PRAK-2021-09 -k TBIE-2021-08"
             # allow change of 2 bytes from auth key name, 384+32 from signature, up to 3x16 chunk padding
             module_changes_limit = 2 + 384 + 32 + 3*16
         # specific first level modules with different keys
         elif (re.match(r'^.*{:s}_0802_v[0-9a-z_.-]*[.]pro[.]fw[.]sig$'.format(platform), modl_inp_fn, re.IGNORECASE)):
-            module_cmdopts = "-k PRAK-2021-09 -k UFIE-2021-08 -f" # UFIE not published, forcing extract encrypted
+            module_cmdopts = "-k PRAK-2021-09 -k UFIE-2021-08"
             # allow change of 2 bytes from auth key name, 384+32 from signature, up to 3x16 chunk padding
             module_changes_limit = 2 + 384 + 32 + 3*16
         # specific first level modules with encrypted data checksum verification issues