From 2a8131d881b6c797f814e61e3b483fd629404604 Mon Sep 17 00:00:00 2001 From: Bjoern Kerler Date: Thu, 19 Sep 2024 18:04:49 +0200 Subject: [PATCH] Fix sla issue --- mtkclient/Library/DA/xflash/xflash_lib.py | 4 +++- mtkclient/Library/DA/xml/xml_lib.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mtkclient/Library/DA/xflash/xflash_lib.py b/mtkclient/Library/DA/xflash/xflash_lib.py index d8a1ed93..b7a28b84 100755 --- a/mtkclient/Library/DA/xflash/xflash_lib.py +++ b/mtkclient/Library/DA/xflash/xflash_lib.py @@ -8,6 +8,8 @@ from binascii import hexlify from struct import pack, unpack +from Cryptodome.Util.number import long_to_bytes + from mtkclient.Library.Auth.sla import generate_da_sla_signature from mtkclient.Library.DA.xflash.xflash_flash_param import NandExtension from mtkclient.Library.DA.xflash.xflash_param import Cmd, ChecksumAlgorithm, FtSystemOSE, DataType @@ -1142,7 +1144,7 @@ def handle_sla(self, da2): rsakey = None from mtkclient.Library.Auth.sla_keys import da_sla_keys for key in da_sla_keys: - if da2.find(bytes.fromhex(key.n)) != -1: + if da2.find(long_to_bytes(key.n)) != -1: rsakey = key break if rsakey is None: diff --git a/mtkclient/Library/DA/xml/xml_lib.py b/mtkclient/Library/DA/xml/xml_lib.py index b4f34c10..ad399aa9 100755 --- a/mtkclient/Library/DA/xml/xml_lib.py +++ b/mtkclient/Library/DA/xml/xml_lib.py @@ -7,6 +7,7 @@ from queue import Queue from threading import Thread +from Cryptodome.Util.number import long_to_bytes from Cryptodome.Cipher import PKCS1_OAEP from Cryptodome.Hash import SHA256 from Cryptodome.PublicKey import RSA @@ -624,7 +625,7 @@ def upload_da(self): from mtkclient.Library.Auth.sla_keys import da_sla_keys, SlaKey for key in da_sla_keys: if isinstance(key, SlaKey): - if da2.find(bytes.fromhex(key.n)) != -1: + if da2.find(long_to_bytes(key.n)) != -1: rsakey = key if rsakey is None: print("No valid sla key found, using dummy auth ....")