xprism1/ntool
1
Fork 0
mirror of https://github.com/xprism1/ntool.git synced 2025-06-19 03:05:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ncch: use programID for seed crypto

Browse Source
This commit is contained in:
xprism1 2023-03-27 10:59:18 +08:00
parent c7bc134e1e
commit fcdfce55a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lib/__init__.py Normal file
View File

8
lib/ctr_ncch.py
View File

@ -110,10 +110,10 @@ class NCCHReader:
self.keyX = [CTR.KeyX0x2C[dev], self.keyX_2[dev]] self.keyX = [CTR.KeyX0x2C[dev], self.keyX_2[dev]]
if self.uses_seed: # This will result in keyY_2 being different if self.uses_seed: # This will result in keyY_2 being different
seed = get_seed(bytes(self.hdr.titleID)) seed = get_seed(bytes(self.hdr.programID))
# Verify seed in SEEDDB # Verify seed in SEEDDB
if hashlib.sha256(seed + self.hdr.titleID).digest()[:4] != bytes(self.hdr.seed_hash): if hashlib.sha256(seed + self.hdr.programID).digest()[:4] != bytes(self.hdr.seed_hash):
raise Exception('Seed in SEEDDB failed verification') raise Exception('Seed in SEEDDB failed verification')
self.keyY[1] = hashlib.sha256(self.keyY[0] + seed).digest()[:16] self.keyY[1] = hashlib.sha256(self.keyY[0] + seed).digest()[:16]
@ -516,8 +516,8 @@ class NCCHBuilder:
'Secure4': 0x0B }[crypto] 'Secure4': 0x0B }[crypto]
if seed == 1: if seed == 1:
hdr.flags[7] |= 0x20 hdr.flags[7] |= 0x20
seed = get_seed(titleID_bytes) seed = get_seed(bytes(hdr.programID))
seed_hash = hashlib.sha256(seed + hdr.titleID).digest()[:4] seed_hash = hashlib.sha256(seed + hdr.programID).digest()[:4]
hdr.seed_hash = (c_uint8 * sizeof(hdr.seed_hash))(*seed_hash) hdr.seed_hash = (c_uint8 * sizeof(hdr.seed_hash))(*seed_hash)
# Modify exheader (if necessary) # Modify exheader (if necessary)