mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-09 20:21:45 +00:00
Code Issues Releases Activity

Perform gamecard initial data area lookup only on demand.

Browse source
This commit is contained in:
Pablo Curiel 2020-08-01 01:17:08 -04:00
parent ca333bd71d
commit 032a4fc22c
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/gamecard.c
View file

@ -108,8 +108,6 @@ static u64 g_gameCardCapacity = 0;
static u8 *g_gameCardHfsRootHeader = NULL; /// GameCardHashFileSystemHeader + (entry_count * GameCardHashFileSystemEntry) + Name Table. static u8 *g_gameCardHfsRootHeader = NULL; /// GameCardHashFileSystemHeader + (entry_count * GameCardHashFileSystemEntry) + Name Table.
static GameCardHashFileSystemPartitionInfo *g_gameCardHfsPartitions = NULL; static GameCardHashFileSystemPartitionInfo *g_gameCardHfsPartitions = NULL;
static GameCardKeyArea g_gameCardKeyArea = {0};
static MemoryLocation g_fsProgramMemory = { static MemoryLocation g_fsProgramMemory = {
.program_id = FS_SYSMODULE_TID, .program_id = FS_SYSMODULE_TID,
.mask = 0, .mask = 0,
@ -138,7 +136,7 @@ NX_INLINE bool gamecardIsInserted(void);
static void gamecardLoadInfo(void); static void gamecardLoadInfo(void);
static void gamecardFreeInfo(void); static void gamecardFreeInfo(void);
static bool gamecardReadInitialData(void); static bool gamecardReadInitialData(GameCardKeyArea *out);
static bool gamecardGetHandleAndStorage(u32 partition); static bool gamecardGetHandleAndStorage(u32 partition);
NX_INLINE void gamecardCloseHandle(void); NX_INLINE void gamecardCloseHandle(void);
@ -288,9 +286,12 @@ bool gamecardReadStorage(void *out, u64 read_size, u64 offset)
bool gamecardGetKeyArea(GameCardKeyArea *out) bool gamecardGetKeyArea(GameCardKeyArea *out)
{ {
/* Read full FS program memory to retrieve the GameCardInitialData block, which is part of the GameCardKeyArea block. */
/* In FS program memory, this is stored as part of the GameCardSecurityInformation struct, which is returned by Lotus command "ChangeToSecureMode" (0xF). */
/* This means it is only available *after* the gamecard secure area has been mounted, which is taken care of in gamecardReadInitialData(). */
/* The GameCardSecurityInformation struct is only kept for documentation purposes. It isn't used at all to retrieve the GameCardInitialData block. */
mutexLock(&g_gamecardMutex); mutexLock(&g_gamecardMutex);
bool ret = (g_gameCardInserted && g_gameCardInfoLoaded && out); bool ret = gamecardReadInitialData(out);
if (ret) memcpy(out, &g_gameCardKeyArea, sizeof(GameCardKeyArea));
mutexUnlock(&g_gamecardMutex); mutexUnlock(&g_gamecardMutex);
return ret; return ret;
} }
@ -733,16 +734,6 @@ static void gamecardLoadInfo(void)
} }
} }
/* Read full FS program memory to retrieve the GameCardInitialData block, which is part of the GameCardKeyArea block. */
/* In FS program memory, this is stored as part of the GameCardSecurityInformation struct, which is returned by Lotus command "ChangeToSecureMode" (0xF). */
/* This means it is only available *after* the gamecard secure area has been both mounted and read from, which has already been taken care of in the last iteration from the previous for() loop. */
/* The GameCardSecurityInformation struct is only kept for documentation purposes. It isn't used at all to retrieve the GameCardInitialData block. */
if (!gamecardReadInitialData())
{
LOGFILE("Failed to read gamecard initial data area from FS program memory!");
goto end;
}
g_gameCardInfoLoaded = true; g_gameCardInfoLoaded = true;
end: end:
@ -751,7 +742,6 @@ end:
static void gamecardFreeInfo(void) static void gamecardFreeInfo(void)
{ {
memset(&g_gameCardKeyArea, 0, sizeof(GameCardKeyArea));
memset(&g_gameCardHeader, 0, sizeof(GameCardHeader)); memset(&g_gameCardHeader, 0, sizeof(GameCardHeader));
g_gameCardStorageNormalAreaSize = 0; g_gameCardStorageNormalAreaSize = 0;
@ -786,8 +776,24 @@ static void gamecardFreeInfo(void)
g_gameCardInfoLoaded = false; g_gameCardInfoLoaded = false;
} }
static bool gamecardReadInitialData(void) static bool gamecardReadInitialData(GameCardKeyArea *out)
{ {
if (!g_gameCardInserted || !g_gameCardInfoLoaded || !out)
{
LOGFILE("Invalid parameters!");
return false;
}
/* Clear output. */
memset(out, 0, sizeof(GameCardKeyArea));
/* Open secure storage area. */
if (!gamecardOpenStorageArea(GameCardStorageArea_Secure))
{
LOGFILE("Failed to open secure storage area!");
return false;
}
bool found = false; bool found = false;
u8 tmp_hash[SHA256_HASH_SIZE] = {0}; u8 tmp_hash[SHA256_HASH_SIZE] = {0};
@ -808,7 +814,7 @@ static bool gamecardReadInitialData(void)
if (!memcmp(tmp_hash, g_gameCardHeader.initial_data_hash, SHA256_HASH_SIZE)) if (!memcmp(tmp_hash, g_gameCardHeader.initial_data_hash, SHA256_HASH_SIZE))
{ {
/* Jackpot. */ /* Jackpot. */
memcpy(&(g_gameCardKeyArea.initial_data), g_fsProgramMemory.data + offset, sizeof(GameCardInitialData)); memcpy(&(out->initial_data), g_fsProgramMemory.data + offset, sizeof(GameCardInitialData));
found = true; found = true;
break; break;
} }