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

Merge pull request #100 from xprism1/master

Browse Source 
Add support for custom decrypted TitleKey
This commit is contained in:
Jack
2021-01-27 06:25:15 +08:00
committed by GitHub
parent 319c4c6a24 73aeef12b8
commit 01ad8fbb1d
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/cia.c
+7 -1
View File
@@ -160,7 +160,7 @@ int GetSettingsFromUsrset(cia_settings *ciaset, user_settings *usrset)
ciaset->verbose = usrset->common.verbose;
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;
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");
@@ -184,6 +184,12 @@ int GetSettingsFromUsrset(cia_settings *ciaset, user_settings *usrset)
if(usrset->cia.randomTitleKey)
rndset(ciaset->common.titleKey,AES_128_KEY_SIZE);
else if(usrset->cia.titleKey){
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]);
usrset->cia.titleKey += 2;
}
}
else
clrmem(ciaset->common.titleKey,AES_128_KEY_SIZE);
makerom/user_settings.c
+9
View File
@@ -559,6 +559,14 @@ int SetArgument(int argc, int i, char *argv[], user_settings *set)
set->cia.randomTitleKey = true;
return 1;
}
else if (strcmp(argv[i], "-titlekey") == 0) {
if (ParamNum != 1) {
PrintArgReqParam(argv[i], 1);
return USR_ARG_REQ_PARAM;
}
set->cia.titleKey = argv[i + 1];
return 2;
}
else if (strcmp(argv[i], "-dlc") == 0) {
if (ParamNum) {
PrintNoNeedParam(argv[i]);
@@ -990,6 +998,7 @@ void DisplayExtendedHelp(char *app_name)
printf(" -dver <version> Data-title version\n");
printf(" -deviceid <hex id> 3DS unique device ID\n");
printf(" -esaccid <hex id> e-Shop account ID\n");
printf(" -titlekey <titlekey> Specify decrypted title key (Overrides \"EnableCrypt\" in RSF to true)\n");
printf(" -rand Use a random title key\n");
printf(" -dlc Create DLC CIA\n");
printf(" -srl <srl file> Package a TWL SRL in a CIA\n");
makerom/user_settings.h
+1
View File
@@ -284,6 +284,7 @@ typedef struct
struct{
bool randomTitleKey;
char *titleKey;
bool encryptCia;
bool DlcContent;
bool includeUpdateNcch;