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

differentiate hash sizes from backup and nand

Browse source
This commit is contained in:
jimzrt 2019-10-07 20:40:41 +02:00
parent eb1b27366e
commit 14424bb7cb
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
source/incognito/incognito.c
View file

@ -669,29 +669,44 @@ out:
return result; return result;
} }
s32 getClientCertSize() s32 getClientCertSize(u8 *blob)
{ {
s32 buffer; s32 buffer;
if (!RETRY(readData((u8 *)&buffer, 0x0AD0, sizeof(buffer), NULL))) if (blob == NULL)
{ {
return -1; if (!RETRY(readData((u8 *)&buffer, 0x0AD0, sizeof(buffer), NULL)))
{
return -1;
}
}
else
{
memcpy(&buffer, blob + 0x0AD0, sizeof(buffer));
} }
return buffer; return buffer;
} }
s32 getCalibrationDataSize() s32 getCalibrationDataSize(u8 *blob)
{ {
s32 buffer; s32 buffer;
if (!RETRY(readData((u8 *)&buffer, 0x08, sizeof(buffer), NULL))) if (blob == NULL)
{ {
return -1; if (!RETRY(readData((u8 *)&buffer, 0x08, sizeof(buffer), NULL)))
{
return -1;
}
} }
else
{
memcpy(&buffer, blob + 0x08, sizeof(buffer));
}
return buffer; return buffer;
} }
bool writeCal0Hash() bool writeCal0Hash()
{ {
s32 calibrationSize = getCalibrationDataSize(); s32 calibrationSize = getCalibrationDataSize(NULL);
if (calibrationSize == -1) if (calibrationSize == -1)
return false; return false;
@ -700,7 +715,7 @@ bool writeCal0Hash()
bool writeClientCertHash() bool writeClientCertHash()
{ {
s32 certSize = getClientCertSize(); s32 certSize = getClientCertSize(NULL);
if (certSize == -1) if (certSize == -1)
return false; return false;
@ -709,7 +724,7 @@ bool writeClientCertHash()
bool verifyCal0Hash(u8 *blob) bool verifyCal0Hash(u8 *blob)
{ {
s32 calibrationSize = getCalibrationDataSize(); s32 calibrationSize = getCalibrationDataSize(blob);
if (calibrationSize == -1) if (calibrationSize == -1)
return false; return false;
@ -718,7 +733,7 @@ bool verifyCal0Hash(u8 *blob)
bool verifyClientCertHash(u8 *blob) bool verifyClientCertHash(u8 *blob)
{ {
s32 certSize = getClientCertSize(); s32 certSize = getClientCertSize(blob);
if (certSize == -1) if (certSize == -1)
return false; return false;
@ -865,6 +880,7 @@ bool backupProdinfo()
gfx_printf("\n%kError reading from NAND!\n", COLOR_RED); gfx_printf("\n%kError reading from NAND!\n", COLOR_RED);
goto out; goto out;
} }
gfx_putc('\n');
if (!verifyProdinfo(bufferNX)) if (!verifyProdinfo(bufferNX))
{ {
goto out; goto out;