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

Fixed CFA handling which broke in commit 046bb359. Fixes #73.

Browse Source
This commit is contained in:
profi200
2018-07-28 22:17:33 +02:00
parent 9c32ddeb75
commit f585df73a4
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctrtool/ctrtool
BIN
View File
Binary file not shown.
ctrtool/ncch.c
+9 -7
View File
@@ -416,9 +416,10 @@ void ncch_process(ncch_context* ctx, u32 actions)
return; return;
} }
if (getle32(ctx->header.extendedheadersize) != 0x400) const u32 exheaderSize = getle32(ctx->header.extendedheadersize);
if (exheaderSize != 0x400 && exheaderSize != 0)
{ {
fprintf(stdout, "Error, exheader is 0x%02x bytes long, expected 0x0400\n", getle32(ctx->header.extendedheadersize)); fprintf(stdout, "Error, exheader is 0x%02x bytes long, expected 0x400 or 0\n", getle32(ctx->header.extendedheadersize));
return; return;
} }
@@ -612,8 +613,9 @@ void ncch_determine_key(ncch_context* ctx, u32 actions)
u8 seedbuf[0x20]; u8 seedbuf[0x20];
u8* seed; u8* seed;
u8* keyX = NULL; u8* keyX = NULL;
u8 hash[0x20]; u8 hash[0x20] = {0};
ctr_ncchheader* header = &ctx->header; ctr_ncchheader* header = &ctx->header;
const u32 exheaderSize = getle32(header->extendedheadersize);
struct sNcchKeyslot struct sNcchKeyslot
{ {
u8 x[0x10]; u8 x[0x10];
@@ -625,9 +627,9 @@ void ncch_determine_key(ncch_context* ctx, u32 actions)
// Check if the NCCH is already decrypted, by checking if the exheader hash matches // Check if the NCCH is already decrypted, by checking if the exheader hash matches
// Otherwise, use determination rules // Otherwise, use determination rules
fseeko64(ctx->file, ncch_get_exheader_offset(ctx), SEEK_SET); fseeko64(ctx->file, ncch_get_exheader_offset(ctx), SEEK_SET);
memset(exheader_buffer, 0, 0x400); memset(exheader_buffer, 0, exheaderSize);
fread(exheader_buffer, 1, 0x400, ctx->file); fread(exheader_buffer, 1, exheaderSize, ctx->file);
ctr_sha_256(exheader_buffer, 0x400, hash); ctr_sha_256(exheader_buffer, exheaderSize, hash);
if (!memcmp(hash, header->extendedheaderhash, 32)) if (!memcmp(hash, header->extendedheaderhash, 32))
{ {
// exheader hash matches, so probably decrypted // exheader hash matches, so probably decrypted
@@ -831,7 +833,7 @@ void ncch_print(ncch_context* ctx)
else else
memdump(stdout, "Logo hash (FAIL): ", header->logohash, 0x20); memdump(stdout, "Logo hash (FAIL): ", header->logohash, 0x20);
fprintf(stdout, "Product code: %.16s\n", header->productcode); fprintf(stdout, "Product code: %.16s\n", header->productcode);
fprintf(stdout, "Exheader size: 00000400\n"); //this is always the same fprintf(stdout, "Exheader size: 0x%x\n", getle32(header->extendedheadersize));
if (ctx->exheaderhashcheck == Unchecked) if (ctx->exheaderhashcheck == Unchecked)
memdump(stdout, "Exheader hash: ", header->extendedheaderhash, 0x20); memdump(stdout, "Exheader hash: ", header->extendedheaderhash, 0x20);
else if (ctx->exheaderhashcheck == Good) else if (ctx->exheaderhashcheck == Good)