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

[makerom] Relaxed support for bad signatures (-ignoresign). Warns user when something cannot be signed, instead of treating it like a fatal error.

Browse Source
This commit is contained in:
jakcron
2017-05-28 10:27:55 +08:00
parent 4f875b0d0b
commit 6e858be07b
9 changed files with 212 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/user_settings.c
+9 -5
View File
@@ -85,6 +85,7 @@ void SetDefaults(user_settings *set)
// Target Info
set->common.keys.keyset = pki_TEST;
set->common.keys.accessDescSign.presetType = desc_NotSpecified;
set->common.keys.ignore_sign = false;
// Build NCCH Info
set->ncch.useSecCrypto = true;
@@ -195,6 +196,7 @@ int SetArgument(int argc, int i, char *argv[], user_settings *set)
}
return 2;
}
/*
else if (strcmp(argv[i], "-ckeyid") == 0) {
if (ParamNum != 1) {
PrintArgReqParam(argv[i], 1);
@@ -222,6 +224,7 @@ int SetArgument(int argc, int i, char *argv[], user_settings *set)
}
return 2;
}
*/
else if (strcmp(argv[i], "-showkeys") == 0) {
if (ParamNum) {
PrintNoNeedParam(argv[i]);
@@ -230,12 +233,12 @@ int SetArgument(int argc, int i, char *argv[], user_settings *set)
set->common.keys.dumpkeys = true;
return 1;
}
else if (strcmp(argv[i], "-fsign") == 0) {
else if (strcmp(argv[i], "-ignoresign") == 0) {
if (ParamNum) {
PrintNoNeedParam(argv[i]);
return USR_BAD_ARG;
}
set->common.keys.rsa.isFalseSign = true;
set->common.keys.ignore_sign = true;
return 1;
}
@@ -949,10 +952,11 @@ void DisplayExtendedHelp(char *app_name)
printf(" 't' Test(false) Keys & prod Certs\n");
printf(" 'd' Development Keys & Certs\n");
printf(" 'p' Production Keys & Certs\n");
printf(" -ckeyid <index> Override the automatic common key selection\n");
printf(" -ncchseckey <index> Ncch keyX index ('0'=1.0+, '1'=7.0+)\n");
//printf(" -ckeyid <index> Override the automatic common key selection\n");
//printf(" -ncchseckey <index> Ncch keyX index ('0'=1.0+, '1'=7.0+)\n");
printf(" -showkeys Display the loaded key chain\n");
printf(" -fsign Ignore invalid signatures\n");
//printf(" -fsign False sign digital signatures\n");
printf(" -ignoresign Ignore invalid signatures\n");
printf("NCCH OPTIONS:\n");
printf(" -elf <file> ELF file\n");
printf(" -icon <file> Icon file\n");