rvtr/TDT
1
Fork 0
mirror of https://github.com/rvtr/TDT.git synced 2025-06-19 03:05:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken header bug

Browse Source 
PolarSSL overwrites the IVs and breaks anything past the first install.

Here the content IV was overwritten, so the first 16 bytes could not be decrypted properly. Should be the last issue for this.
This commit is contained in:
rmc 2024-04-05 01:42:41 -04:00
parent de6ccd9f60
commit a7a16b59e1
No known key found for this signature in database
GPG Key ID: 5633EC10309D77D1
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arm9/src/install.c
View File

@ -867,11 +867,11 @@ complete:
if (!sdnandMode) if (!sdnandMode)
nandio_lock_writing(); nandio_lock_writing();
remove("sd:/_nds/tadtests/tmp/temp.tmd"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.tmd");
remove("sd:/_nds/tadtests/tmp/temp.tik"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.tik");
remove("sd:/_nds/tadtests/tmp/temp.srl.enc"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl.enc");
remove("sd:/_nds/tadtests/tmp/temp.srl"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl");
rmdir("sd:/_nds/TADDeliveryTool/tmp");
return result; return result;
} }

31
arm9/src/tad.c
View File

@ -106,8 +106,8 @@ int openTad(char const* src) {
// idk how to create folders recursively // idk how to create folders recursively
mkdir("sd:/_nds", 0777); mkdir("sd:/_nds", 0777);
mkdir("sd:/_nds/tadtests", 0777); mkdir("sd:/_nds/TADDeliveryTool", 0777);
mkdir("sd:/_nds/tadtests/tmp", 0777); mkdir("sd:/_nds/TADDeliveryTool/tmp", 0777);
/* /*
Please excuse my terrible copy paste coding. I do not know C and I'm translating from other languages Please excuse my terrible copy paste coding. I do not know C and I'm translating from other languages
@ -196,13 +196,13 @@ int openTad(char const* src) {
iprintf("Copying output files...\n"); iprintf("Copying output files...\n");
// Sorry for copy pasting, I'll make this a routine later // Sorry for copy pasting, I'll make this a routine later
iprintf(" Copying TMD...\n"); iprintf(" Copying TMD...\n");
copyFilePart(src, tad.tmdOffset, swap_endian_u32(header.tmdSize), "sd:/_nds/tadtests/tmp/temp.tmd"); copyFilePart(src, tad.tmdOffset, swap_endian_u32(header.tmdSize), "sd:/_nds/TADDeliveryTool/tmp/temp.tmd");
iprintf(" Copying ticket...\n"); iprintf(" Copying ticket...\n");
copyFilePart(src, tad.ticketOffset, swap_endian_u32(header.ticketSize), "sd:/_nds/tadtests/tmp/temp.tik"); copyFilePart(src, tad.ticketOffset, swap_endian_u32(header.ticketSize), "sd:/_nds/TADDeliveryTool/tmp/temp.tik");
iprintf(" Copying SRL...\n"); iprintf(" Copying SRL...\n");
copyFilePart(src, tad.srlOffset, swap_endian_u32(header.srlSize), "sd:/_nds/tadtests/tmp/temp.srl.enc"); copyFilePart(src, tad.srlOffset, swap_endian_u32(header.srlSize), "sd:/_nds/TADDeliveryTool/tmp/temp.srl.enc");
/* /*
Get the title key + IV from the ticket. Get the title key + IV from the ticket.
@ -210,7 +210,7 @@ int openTad(char const* src) {
iprintf("Decrypting SRL...\n"); iprintf("Decrypting SRL...\n");
//iprintf(" Finding title key...\n"); //iprintf(" Finding title key...\n");
FILE *ticket = fopen("sd:/_nds/tadtests/tmp/temp.tik", "rb"); FILE *ticket = fopen("sd:/_nds/TADDeliveryTool/tmp/temp.tik", "rb");
unsigned char title_key_enc[16]; unsigned char title_key_enc[16];
fseek(ticket, 447, SEEK_SET); fseek(ticket, 447, SEEK_SET);
fread(title_key_enc, 1, 16, ticket); fread(title_key_enc, 1, 16, ticket);
@ -247,21 +247,21 @@ int openTad(char const* src) {
keyFail = decryptTad(devKey, title_key_iv, title_key_enc, content_iv, swap_endian_u32(header.srlSize), srlTidLow); keyFail = decryptTad(devKey, title_key_iv, title_key_enc, content_iv, swap_endian_u32(header.srlSize), srlTidLow);
if (keyFail == TRUE) { if (keyFail == TRUE) {
remove("sd:/_nds/tadtests/tmp/temp.srl"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl");
iprintf("Key fail!\n\nTrying debugger common key...\n"); iprintf("Key fail!\n\nTrying debugger common key...\n");
keyFail = decryptTad(debuggerKey, title_key_iv, title_key_enc, content_iv, swap_endian_u32(header.srlSize), srlTidLow); keyFail = decryptTad(debuggerKey, title_key_iv, title_key_enc, content_iv, swap_endian_u32(header.srlSize), srlTidLow);
} }
if (keyFail == TRUE) { if (keyFail == TRUE) {
remove("sd:/_nds/tadtests/tmp/temp.srl"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl");
iprintf("Key fail!\n\nTrying prod common key...\n"); iprintf("Key fail!\n\nTrying prod common key...\n");
keyFail = decryptTad(prodKey, title_key_iv, title_key_enc, content_iv, swap_endian_u32(header.srlSize), srlTidLow); keyFail = decryptTad(prodKey, title_key_iv, title_key_enc, content_iv, swap_endian_u32(header.srlSize), srlTidLow);
} }
if (keyFail == TRUE) { if (keyFail == TRUE) {
remove("sd:/_nds/tadtests/tmp/temp.srl"); remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl");
iprintf("All keys failed!\n"); iprintf("All keys failed!\n");
return "ERROR"; return "ERROR";
} }
return "sd:/_nds/tadtests/tmp/temp.srl"; return "sd:/_nds/TADDeliveryTool/tmp/temp.srl";
} }
@ -273,15 +273,17 @@ bool decryptTad(unsigned char* commonKey,
unsigned char* srlTidLow) { unsigned char* srlTidLow) {
unsigned char title_key_dec[16]; unsigned char title_key_dec[16];
unsigned char title_key_iv_bak[16]; unsigned char title_key_iv_bak[16];
unsigned char content_iv_bak[16];
unsigned char srl_buffer_enc[16]; unsigned char srl_buffer_enc[16];
unsigned char srl_buffer_dec[16]; unsigned char srl_buffer_dec[16];
// Backup IV because PolarSSL will overwrite it // Backup IVs because PolarSSL will overwrite it
memcpy( title_key_iv_bak, title_key_iv, 16 ); memcpy( title_key_iv_bak, title_key_iv, 16 );
memcpy( content_iv_bak, content_iv, 16 );
FILE *srlFile_enc = fopen("sd:/_nds/tadtests/tmp/temp.srl.enc", "rb"); FILE *srlFile_enc = fopen("sd:/_nds/TADDeliveryTool/tmp/temp.srl.enc", "rb");
fseek(srlFile_enc, 0, SEEK_SET); fseek(srlFile_enc, 0, SEEK_SET);
FILE *srlFile_dec = fopen("sd:/_nds/tadtests/tmp/temp.srl", "wb"); FILE *srlFile_dec = fopen("sd:/_nds/TADDeliveryTool/tmp/temp.srl", "wb");
fseek(srlFile_dec, 0, SEEK_SET); fseek(srlFile_dec, 0, SEEK_SET);
iprintf(" Decrypting SRL in chunks..\n"); iprintf(" Decrypting SRL in chunks..\n");
@ -305,8 +307,9 @@ bool decryptTad(unsigned char* commonKey,
} }
fclose(srlFile_dec); fclose(srlFile_dec);
fclose(srlFile_enc); fclose(srlFile_enc);
// Restore IV // Restore IVs
memcpy( title_key_iv, title_key_iv_bak, 16 ); memcpy( title_key_iv, title_key_iv_bak, 16 );
memcpy( content_iv, content_iv_bak, 16 );
return keyFail; return keyFail;
} }