Restructure and minor bug fix

bkerler · Jun 29, 2024 · f13dbd0 · f13dbd0
1 parent a39e0f0
commit f13dbd0
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 7 deletions.
diff --git a/mtkclient/Tools/__init__.py → Tools/__init__.py b/mtkclient/Tools/__init__.py → Tools/__init__.py
diff --git a/mtkclient/Tools/brom_to_offs.py → Tools/brom_to_offs.py b/mtkclient/Tools/brom_to_offs.py → Tools/brom_to_offs.py
diff --git a/mtkclient/Tools/da_info.txt → Tools/da_info.txt b/mtkclient/Tools/da_info.txt → Tools/da_info.txt
diff --git a/mtkclient/Tools/da_parser.py → Tools/da_parser.py b/mtkclient/Tools/da_parser.py → Tools/da_parser.py
@@ -5,7 +5,7 @@
 from struct import unpack
 import inspect
 current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-parent_dir = os.path.dirname(os.path.dirname(current_dir))
+parent_dir =os.path.dirname(current_dir)
 sys.path.insert(0, parent_dir)
 from mtkclient.config.payloads import PathConfig
 from mtkclient.Library.utils import read_object
@@ -92,6 +92,9 @@ def main():
                 with open(loader, "rb") as rf:
                     rf.seek(mbuf)
                     data = rf.read(m_len)
+                    test=data.find(b"\x08\x00\xa8\x52\xff\x02\x08\xeb")
+                    if test != -1:
+                        print("Device is patched against carbonara :(")
                     hashidx = data.find(int.to_bytes(0xC0070004, 4, 'little'))
                     if hashidx != -1:
                         print("Hash check found.")

diff --git a/mtkclient/Tools/decode.py → Tools/decode.py b/mtkclient/Tools/decode.py → Tools/decode.py
diff --git a/mtkclient/Tools/emulate_preloader.py → Tools/emulate_preloader.py b/mtkclient/Tools/emulate_preloader.py → Tools/emulate_preloader.py
@@ -226,7 +226,7 @@ def send_usb_response(regs):
 
 
 def main():
-    pfilename = os.path.join("..", "Loader", "Preloader", "preloader_k71v1_64_bsp.bin")
+    pfilename = os.path.join("../mtkclient", "Loader", "Preloader", "preloader_k71v1_64_bsp.bin")
     payload = open(pfilename, "rb").read()
 
     mu = Uc(UC_ARCH_ARM, UC_MODE_THUMB)

diff --git a/mtkclient/Tools/enc_test.py → Tools/enc_test.py b/mtkclient/Tools/enc_test.py → Tools/enc_test.py
diff --git a/mtkclient/Tools/get_preloader_values.py → Tools/get_preloader_values.py b/mtkclient/Tools/get_preloader_values.py → Tools/get_preloader_values.py
@@ -5,7 +5,7 @@
 
 def main():
     loaders = []
-    for root, dirs, files in os.walk(".", topdown=False):
+    for root, dirs, files in os.walk("", topdown=False):
         for file in files:
             loaders.append(os.path.join(root, file))
 

diff --git a/mtkclient/Tools/mmc_init.txt → Tools/mmc_init.txt b/mtkclient/Tools/mmc_init.txt → Tools/mmc_init.txt
diff --git a/mtkclient/Tools/mmc_only_init.txt → Tools/mmc_only_init.txt b/mtkclient/Tools/mmc_only_init.txt → Tools/mmc_only_init.txt
diff --git a/mtkclient/Tools/nb0extract.py → Tools/nb0extract.py b/mtkclient/Tools/nb0extract.py → Tools/nb0extract.py
diff --git a/mtkclient/Tools/parsebootrom.sh → Tools/parsebootrom.sh b/mtkclient/Tools/parsebootrom.sh → Tools/parsebootrom.sh
diff --git a/mtkclient/Tools/parsebootrom.txt → Tools/parsebootrom.txt b/mtkclient/Tools/parsebootrom.txt → Tools/parsebootrom.txt
diff --git a/mtkclient/Tools/patch_legacy.py → Tools/patch_legacy.py b/mtkclient/Tools/patch_legacy.py → Tools/patch_legacy.py
diff --git a/mtkclient/Tools/patch_preloader.py → Tools/patch_preloader.py b/mtkclient/Tools/patch_preloader.py → Tools/patch_preloader.py
diff --git a/Tools/payload.bin b/Tools/payload.bin
diff --git a/Tools/payload.bin.idb b/Tools/payload.bin.idb
diff --git a/mtkclient/Tools/preloader_emu_mmc.py → Tools/preloader_emu_mmc.py b/mtkclient/Tools/preloader_emu_mmc.py → Tools/preloader_emu_mmc.py
diff --git a/mtkclient/Tools/preloader_to_dram.py → Tools/preloader_to_dram.py b/mtkclient/Tools/preloader_to_dram.py → Tools/preloader_to_dram.py
diff --git a/mtkclient/Tools/rpmb_test.py → Tools/rpmb_test.py b/mtkclient/Tools/rpmb_test.py → Tools/rpmb_test.py
diff --git a/mtkclient/Tools/whitelist_parser.py → Tools/whitelist_parser.py b/mtkclient/Tools/whitelist_parser.py → Tools/whitelist_parser.py
diff --git a/mtkclient/Library/DA/mtk_daloader.py b/mtkclient/Library/DA/mtk_daloader.py
@@ -61,8 +61,8 @@ def writestate(self):
             config["socid"] = hexlify(self.config.socid).decode('utf-8')
         config["flashtype"] = self.daconfig.flashtype
         config["flashsize"] = self.daconfig.flashsize
-        if (not self.mtk.config.chipconfig.damode == DAmodes.XFLASH and not
-        self.mtk.config.chipconfig.damode == DAmodes.XML):
+        if (not self.mtk.config.chipconfig.damode == DAmodes.XFLASH and
+                not self.mtk.config.chipconfig.damode == DAmodes.XML):
             config["m_emmc_ua_size"] = self.da.emmc.m_emmc_ua_size
             config["m_emmc_boot1_size"] = self.da.emmc.m_emmc_boot1_size
             config["m_emmc_boot2_size"] = self.da.emmc.m_emmc_boot2_size

diff --git a/pyproject.toml b/pyproject.toml
@@ -41,8 +41,8 @@ Issues = "https://github.com/bkerler/mtkclient/issues"
 [project.scripts]
 mtk = "mtk:main"
 stage2 = "stage2:main"
-da_parser = "mtkclient.Tools.da_parser:main"
-brom_to_offs = "mtkclient.Tools.brom_to_offs:main"
+da_parser = "Tools.da_parser:main"
+brom_to_offs = "Tools.brom_to_offs:main"
 
 [project.gui-scripts]
 mtk_gui = "mtkclient.mtk_gui:main"