mirrors/Incognito_RCM
1
0
Fork 0
mirror of https://github.com/Scandal-UK/Incognito_RCM.git synced 2024-11-22 11:56:41 +00:00
Code Issues Releases Activity

Cleaned up output warnings

Browse source
This commit is contained in:
Dan Ware 2020-06-06 19:23:28 +01:00
parent 34dd3fff4c
commit d29010a84b
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/incognito/incognito.c
View file

@ -156,19 +156,19 @@ bool calculateAndWriteCrc(u32 offset, u32 size)
void validateChecksums(u8 *blob) void validateChecksums(u8 *blob)
{ {
if (!validateCrc(0x0250, 0x1E, blob)) if (!validateCrc(0x0250, 0x1E, blob))
gfx_printf("%kWarning - invalid serial number checksum\n", COLOR_GREEN); gfx_printf("%kWarning - invalid serial crc\n", COLOR_RED);
if (!validateCrc(0x0480, 0x18E, blob)) if (!validateCrc(0x0480, 0x18E, blob))
gfx_printf("%kWarning - invalid ECC-B233 device cert checksum...\n", COLOR_RED); gfx_printf("%kWarning - invalid ECC-B233 crc...\n", COLOR_RED);
if (!validateCrc(0x3AE0, 0x13E, blob)) if (!validateCrc(0x3AE0, 0x13E, blob))
gfx_printf("%kWarning - invalid extended SSL key checksum...\n", COLOR_RED); gfx_printf("%kWarning - invalid ext SSL key crc...\n", COLOR_RED);
if (!validateCrc(0x35A0, 0x07E, blob)) if (!validateCrc(0x35A0, 0x07E, blob))
gfx_printf("%kWarning - invalid Amiibo ECDSA cert checksum...\n", COLOR_RED); gfx_printf("%kWarning - invalid ECDSA cert crc...\n", COLOR_RED);
if (!validateCrc(0x36A0, 0x09E, blob)) if (!validateCrc(0x36A0, 0x09E, blob))
gfx_printf("%kWarning - invalid Amiibo ECQV-BLS root cert checksum...\n", COLOR_RED); gfx_printf("%kWarning - invalid ECQV-BLS cert crc...\n", COLOR_RED);
} }
bool dump_keys() bool dump_keys()
@ -382,18 +382,11 @@ bool dump_keys()
return false; return false;
} }
u32 serialOffset = 0x250;
char serial[15]; char serial[15];
readData((u8 *)serial, serialOffset, 14, NULL); readData((u8 *)serial, 0x250, 14, NULL);
gfx_printf("%kCurrent serial: [%s]\n\n", COLOR_BLUE, serial); gfx_printf("%kCurrent serial: [%s]\n\n", COLOR_BLUE, serial);
if (validateCrc(serialOffset, 0x1E, NULL))
gfx_printf("%kValid serial checksum\n", COLOR_GREEN);
else
gfx_printf("%kWarning - invalid serial checksum\n", COLOR_RED);
return true; return true;
} }
@ -424,7 +417,6 @@ bool writeSerial()
return calculateAndWriteCrc(serialOffset, 0x1E); return calculateAndWriteCrc(serialOffset, 0x1E);
} }
// todo: include crc block in sizes
bool incognito() bool incognito()
{ {
gfx_printf("%kChecking if backup exists...\n", COLOR_YELLOW); gfx_printf("%kChecking if backup exists...\n", COLOR_YELLOW);
@ -477,11 +469,11 @@ bool incognito()
return false; return false;
gfx_printf("%kErasing RSA-2048 extended device key...\n", COLOR_YELLOW); gfx_printf("%kErasing RSA-2048 extended device key...\n", COLOR_YELLOW);
if (!erase(0x3D70, 0x240)) // seems empty & unused... if (!erase(0x3D70, 0x240)) // seems empty & unused!
return false; return false;
gfx_printf("%kErasing RSA-2048 device certificate...\n", COLOR_YELLOW); gfx_printf("%kErasing RSA-2048 device certificate...\n", COLOR_YELLOW);
if (!erase(0x3FC0, 0x240)) // seems empty & unused... if (!erase(0x3FC0, 0x240)) // seems empty & unused!
return false; return false;
gfx_printf("%kWriting SSL cert hash...\n", COLOR_YELLOW); gfx_printf("%kWriting SSL cert hash...\n", COLOR_YELLOW);