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

[ctrtool] Catch failure to load ncch keyX properly.

Browse Source
This commit is contained in:
jakcron
2017-06-06 14:00:46 +08:00
parent cbfa5398a9
commit e5b79babc8
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctrtool/ncch.c
+25 -32
View File
@@ -520,6 +520,7 @@ void ncch_determine_key(ncch_context* ctx, u32 actions)
u8 exheader_buffer[0x400];
u8 seedbuf[0x20];
u8* seed;
u8* keyX = NULL;
u8 hash[0x20];
ctr_ncchheader* header = &ctx->header;
struct sNcchKeyslot
@@ -589,44 +590,36 @@ void ncch_determine_key(ncch_context* ctx, u32 actions)
// setup second keyslot seed (romfs, exefs:!(icon|banner))
// - get keyX
if (header->flags[3] == 0)
{
memcpy(key[1].x, key[0].x, 0x10);
}
else if (header->flags[3] == 1)
{
if (settings_get_ncchkeyX_seven(ctx->usersettings) == NULL)
{
fprintf(stderr, "Error, could not read NCCH 7.0 keyX.\n");
return;
}
memcpy(key[1].x, settings_get_ncchkeyX_seven(ctx->usersettings), 0x10);
}
else if (header->flags[3] == 10)
{
if (settings_get_ncchkeyX_ninethree(ctx->usersettings) == NULL)
{
fprintf(stderr, "Error, could not read NCCH 9.3 keyX.\n");
return;
}
memcpy(key[1].x, settings_get_ncchkeyX_ninethree(ctx->usersettings), 0x10);
}
else if (header->flags[3] == 11)
{
if (settings_get_ncchkeyX_ninesix(ctx->usersettings) == NULL)
{
fprintf(stderr, "Error, could not read NCCH 9.6 keyX.\n");
return;
}
memcpy(key[1].x, settings_get_ncchkeyX_ninesix(ctx->usersettings), 0x10);
}
else
switch (header->flags[3])
{
case(0):
keyX = settings_get_ncchkeyX_old(ctx->usersettings);
break;
case(1):
keyX = settings_get_ncchkeyX_seven(ctx->usersettings);
break;
case(10):
keyX = settings_get_ncchkeyX_ninethree(ctx->usersettings);
break;
case(11):
keyX = settings_get_ncchkeyX_ninesix(ctx->usersettings);
break;
default:
fprintf(stderr, "Warning, unknown NCCH crypto method.\n");
ctx->encrypted = NCCHCRYPTO_BROKEN;
return;
}
if (keyX == NULL)
{
fprintf(stderr, "Error, could not read NCCH keyX.\n");
ctx->encrypted = NCCHCRYPTO_BROKEN;
return;
}
memcpy(key[1].x, keyX, 0x10);
// - get keyY
if (header->flags[7] & 0x20)
{