DocRock3r/custom-install
1
0
Fork 0
mirror of https://github.com/ihaveamac/custom-install.git synced 2026-01-24 15:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

custominstall: verify content hashes

Browse Source
This commit is contained in:
Ian Burgwin
2020-12-02 22:29:53 -08:00
parent fcf47e0564
commit 46ce6ab76c
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
custominstall.py
View File

@@ -165,15 +165,19 @@ class CustomInstall:
def copy_with_progress(self, src: BinaryIO, dst: BinaryIO, size: int, path: str, fire_event: bool = True): def copy_with_progress(self, src: BinaryIO, dst: BinaryIO, size: int, path: str, fire_event: bool = True):
left = size left = size
cipher = self.crypto.create_ctr_cipher(Keyslot.SD, self.crypto.sd_path_to_iv(path)) cipher = self.crypto.create_ctr_cipher(Keyslot.SD, self.crypto.sd_path_to_iv(path))
hasher = sha256()
while left > 0: while left > 0:
to_read = min(READ_SIZE, left) to_read = min(READ_SIZE, left)
data = cipher.encrypt(src.read(READ_SIZE)) data = src.read(READ_SIZE)
dst.write(data) hasher.update(data)
dst.write(cipher.encrypt(data))
left -= to_read left -= to_read
total_read = size - left total_read = size - left
if fire_event: if fire_event:
self.event.update_percentage((total_read / size) * 100, total_read / 1048576, size / 1048576) self.event.update_percentage((total_read / size) * 100, total_read / 1048576, size / 1048576)
return hasher.digest()
def prepare_titles(self, paths: 'List[PathLike]'): def prepare_titles(self, paths: 'List[PathLike]'):
readers = [] readers = []
for path in paths: for path in paths:
@@ -341,6 +345,8 @@ class CustomInstall:
with self.crypto.create_ctr_io(Keyslot.SD, o, self.crypto.sd_path_to_iv(tmd_enc_path)) as e: with self.crypto.create_ctr_io(Keyslot.SD, o, self.crypto.sd_path_to_iv(tmd_enc_path)) as e:
e.write(bytes(cia.tmd)) e.write(bytes(cia.tmd))
# in case the contents are corrupted
do_continue = False
# write each content # write each content
for co in cia.content_info: for co in cia.content_info:
content_filename = co.id + '.app' content_filename = co.id + '.app'
@@ -353,7 +359,16 @@ class CustomInstall:
content_out_path = join(temp_content_root, content_filename) content_out_path = join(temp_content_root, content_filename)
self.log(f'Writing {content_enc_path}...') self.log(f'Writing {content_enc_path}...')
with cia.open_raw_section(co.cindex) as s, open(content_out_path, 'wb') as o: with cia.open_raw_section(co.cindex) as s, open(content_out_path, 'wb') as o:
self.copy_with_progress(s, o, co.size, content_enc_path) result_hash = self.copy_with_progress(s, o, co.size, content_enc_path)
if result_hash != co.hash:
self.log(f'WARNING: Hash does not match for {content_enc_path}!')
install_state['failed'].append(display_title)
rename(temp_title_root, f'{temp_title_root}-corrupted-{randint(0, 0xFFFFFFFF):08x}')
do_continue = True
break
if do_continue:
continue
# generate a blank save # generate a blank save
if cia.tmd.save_size: if cia.tmd.save_size:
@@ -493,11 +508,11 @@ class CustomInstall:
install_state['installed'].append(display_title) install_state['installed'].append(display_title)
copied = False
if install_state['installed']: if install_state['installed']:
finalize_3dsx_orig_path = join(script_dir, 'custom-install-finalize.3dsx') finalize_3dsx_orig_path = join(script_dir, 'custom-install-finalize.3dsx')
hb_dir = join(self.sd, '3ds') hb_dir = join(self.sd, '3ds')
finalize_3dsx_path = join(hb_dir, 'custom-install-finalize.3dsx') finalize_3dsx_path = join(hb_dir, 'custom-install-finalize.3dsx')
copied = False
if isfile(finalize_3dsx_orig_path): if isfile(finalize_3dsx_orig_path):
self.log('Copying finalize program to ' + finalize_3dsx_path) self.log('Copying finalize program to ' + finalize_3dsx_path)
makedirs(hb_dir, exist_ok=True) makedirs(hb_dir, exist_ok=True)