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

Override content.encryptCia when titlekey specified

Browse Source
This commit is contained in:
xprism1
2021-01-27 02:12:47 +08:00
parent 928d915196
commit 24149fcf6e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/cia.c
+5 -5
View File
@@ -160,7 +160,7 @@ int GetSettingsFromUsrset(cia_settings *ciaset, user_settings *usrset)
ciaset->verbose = usrset->common.verbose; ciaset->verbose = usrset->common.verbose;
ciaset->tmd.titleType = TYPE_CTR; ciaset->tmd.titleType = TYPE_CTR;
ciaset->content.encryptCia = usrset->common.rsfSet.Option.EnableCrypt; ciaset->content.encryptCia = usrset->common.rsfSet.Option.EnableCrypt || usrset->cia.titleKey != NULL;
ciaset->content.IsDlc = usrset->cia.DlcContent; ciaset->content.IsDlc = usrset->cia.DlcContent;
if(ciaset->keys->aes.commonKey[ciaset->keys->aes.currentCommonKey] == NULL && ciaset->content.encryptCia){ if(ciaset->keys->aes.commonKey[ciaset->keys->aes.currentCommonKey] == NULL && ciaset->content.encryptCia){
fprintf(stderr,"[CIA WARNING] Common Key could not be loaded, CIA will not be encrypted\n"); fprintf(stderr,"[CIA WARNING] Common Key could not be loaded, CIA will not be encrypted\n");
@@ -185,10 +185,10 @@ int GetSettingsFromUsrset(cia_settings *ciaset, user_settings *usrset)
if(usrset->cia.randomTitleKey) if(usrset->cia.randomTitleKey)
rndset(ciaset->common.titleKey,AES_128_KEY_SIZE); rndset(ciaset->common.titleKey,AES_128_KEY_SIZE);
else if(usrset->cia.titleKey){ else if(usrset->cia.titleKey){
for (size_t count = 0; count < sizeof(ciaset->common.titleKey)/sizeof(ciaset->common.titleKey[0]); count++) { for (size_t count = 0; count < sizeof(ciaset->common.titleKey)/sizeof(ciaset->common.titleKey[0]); count++) {
sscanf(usrset->cia.titleKey, "%2hhx", &ciaset->common.titleKey[count]); sscanf(usrset->cia.titleKey, "%2hhx", &ciaset->common.titleKey[count]);
usrset->cia.titleKey += 2; usrset->cia.titleKey += 2;
} }
} }
else else
clrmem(ciaset->common.titleKey,AES_128_KEY_SIZE); clrmem(ciaset->common.titleKey,AES_128_KEY_SIZE);