mirror/MikroTikPatch
1
0
Fork 0
mirror of https://huihui.cat/mirrors/MikroTikPatch.git synced 2025-12-10 03:24:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

modified: netinstall.py

Browse source 
modified:   npk.py
This commit is contained in:
zyb 2024-07-16 13:50:22 +08:00
parent 89a1042e60
commit bd814b57d8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
netinstall.py
View file

@ -12,7 +12,6 @@ def find_7zXZ_data(data:bytes):
while b'\x00\x00\x00\x00\x01\x59\x5A' in _data: while b'\x00\x00\x00\x00\x01\x59\x5A' in _data:
offset2 = offset2 + _data.index(b'\x00\x00\x00\x00\x01\x59\x5A') + 7 offset2 = offset2 + _data.index(b'\x00\x00\x00\x00\x01\x59\x5A') + 7
_data = _data[offset2:] _data = _data[offset2:]
offset2
return data[offset1:offset2] return data[offset1:offset2]
def patch_elf(data: bytes,key_dict:dict): def patch_elf(data: bytes,key_dict:dict):
@ -136,7 +135,7 @@ def patch_netinstall(key_dict: dict,input_file,output_file=None):
id,name_ptr,data_ptr,data_size = struct.unpack_from('<IIII',netinstall[offset+i*16:offset+i*16+16]) id,name_ptr,data_ptr,data_size = struct.unpack_from('<IIII',netinstall[offset+i*16:offset+i*16+16])
name = netinstall[text_section_offset+name_ptr-text_section_addr:].split(b'\0')[0] name = netinstall[text_section_offset+name_ptr-text_section_addr:].split(b'\0')[0]
data = netinstall[text_section_offset+data_ptr-text_section_addr:text_section_offset+data_ptr-text_section_addr+data_size] data = netinstall[text_section_offset+data_ptr-text_section_addr:text_section_offset+data_ptr-text_section_addr+data_size]
print(f'found {name.decode()}({id}) bootloader') print(f'found {name.decode()}({id}) bootloader offset {hex(text_section_offset+data_ptr-text_section_addr)} size {data_size}')
try: try:
if data[:2] == b'MZ': if data[:2] == b'MZ':
new_data = patch_pe(data,key_dict) new_data = patch_pe(data,key_dict)

3
npk.py
View file

@ -185,7 +185,8 @@ class NovaPackage:
def sign(self,kcdsa_private_key:bytes,eddsa_private_key:bytes): def sign(self,kcdsa_private_key:bytes,eddsa_private_key:bytes):
import hashlib import hashlib
from mikro import mikro_kcdsa_sign,mikro_eddsa_sign from mikro import mikro_kcdsa_sign,mikro_eddsa_sign
self[NpkPartID.SIGNATURE].data = b'\0'*(20+48+64) if len(self[NpkPartID.SIGNATURE].data) != 20+48+64:
self[NpkPartID.SIGNATURE].data = b'\0'*(20+48+64)
sha1_digest = self.get_digest(hashlib.new('SHA1')) sha1_digest = self.get_digest(hashlib.new('SHA1'))
sha256_digest = self.get_digest(hashlib.new('SHA256')) sha256_digest = self.get_digest(hashlib.new('SHA256'))
kcdsa_signature = mikro_kcdsa_sign(sha256_digest[:20],kcdsa_private_key) kcdsa_signature = mikro_kcdsa_sign(sha256_digest[:20],kcdsa_private_key)