DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-03 00:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from 3DSGuy/unstable

Browse Source 
makerom: misc
This commit is contained in:
applestash
2014-09-20 15:30:49 +08:00
parent de12f54762 a513fb32cb
commit 7c44862657
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/cia.c
+7 -7
View File
@@ -175,7 +175,7 @@ int GetSettingsFromUsrset(cia_settings *ciaset, user_settings *usrset)
} }
// Ticket Data // Ticket Data
ciaset->tik.ticketId = u64GetRand() & 0x0004FFFFFFFFFFFF; ciaset->tik.ticketId = 0x0004000000000000 | (u64GetRand() & 0x0000FFFFFFFFFFFF);
ciaset->tik.deviceId = usrset->cia.deviceId; ciaset->tik.deviceId = usrset->cia.deviceId;
ciaset->tik.eshopAccId = usrset->cia.eshopAccId; ciaset->tik.eshopAccId = usrset->cia.eshopAccId;
ciaset->tik.licenceType = lic_Permanent; ciaset->tik.licenceType = lic_Permanent;
@@ -253,7 +253,7 @@ int GetSettingsFromNcch0(cia_settings *ciaset, u32 ncch0_offset)
ciaset->common.titleId = u8_to_u64(hdr->titleId,LE); ciaset->common.titleId = u8_to_u64(hdr->titleId,LE);
/* Getting ncch key */ /* Getting NCCH key */
u8 *ncchkey = NULL; u8 *ncchkey = NULL;
if(ciaset->content.keyFound && IsNcchEncrypted(hdr)){ if(ciaset->content.keyFound && IsNcchEncrypted(hdr)){
SetNcchKeys(ciaset->keys,hdr); SetNcchKeys(ciaset->keys,hdr);
@@ -265,11 +265,11 @@ int GetSettingsFromNcch0(cia_settings *ciaset, u32 ncch0_offset)
} }
} }
/* Get TMD Data from ncch */ /* Get TMD Data from NCCH */
result = GetTmdDataFromNcch(ciaset,ncch0,info,ncchkey); // Data For TMD result = GetTmdDataFromNcch(ciaset,ncch0,info,ncchkey);
if(result) goto finish; if(result) goto finish;
/* Get META Region from ncch */ /* Get Meta Region from NCCH */
result = GetMetaRegion(ciaset,ncch0,info,ncchkey); // Meta Region result = GetMetaRegion(ciaset,ncch0,info,ncchkey);
/* Finish */ /* Finish */
finish: finish:
/* Return */ /* Return */
@@ -387,7 +387,7 @@ int GetMetaRegion(cia_settings *ciaset, u8 *ncch, ncch_info *info, u8 *key)
memcpy(iconPos,ncch+info->exefsOffset+icon_offset,icon_size); memcpy(iconPos,ncch+info->exefsOffset+icon_offset,icon_size);
if(key != NULL) if(key != NULL)
CryptNcchRegion(iconPos,icon_size,icon_offset,info->titleId,key,ncch_exefs); CryptNcchRegion(iconPos,icon_size,icon_offset,info->titleId,key,ncch_exefs);
cleanup: cleanup:
free(exefsHdr); free(exefsHdr);
free(exhdr); free(exhdr);