rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ホワイトリスト周りのバグ修正

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2790 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2009-04-06 07:54:14 +00:00
parent a383dda74e
commit 95d7418f97
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/libraries_sysmenu/sysmenu/ARM9/src/title.c
View File

@ -344,7 +344,7 @@ static BOOL PrepareDHTDatabase(void)
#endif
}
// 個別対応データベース
s_dht.dhtah = (void*)((u32)s_dht.buffer + DHT_GetDatabaseExLength(s_dht.dhtex));
s_dht.dhtah = (void*)((u32)s_dht.buffer + DHT_GetDatabaseLength(s_dht.dht) + DHT_GetDatabaseExLength(s_dht.dhtex));
if ( sizeof(DHTHeader) != FS_ReadFile(&file, &s_dht.dhtah->header, sizeof(DHTHeader)) )
{
s_dht.dhtah = NULL;
@ -1465,7 +1465,7 @@ static BOOL SYSMi_AuthenticateNTRDownloadTitle( TitleProperty *pBootTitle)
UTL_SetFatalError(FATAL_ERROR_DL_SIGN_DECRYPTION_FAILED);
return FALSE;
}
// それぞれheader,ARM9FLX,ARM7FLXについてハッシュを計算して、それら3つを並べたものに対してまたハッシュをとる
if(s_calc_hash)
{
@ -1479,7 +1479,7 @@ static BOOL SYSMi_AuthenticateNTRDownloadTitle( TitleProperty *pBootTitle)
UTL_SetFatalError(FATAL_ERROR_DL_HASH_CALC_FAILED);
return FALSE;
}
// 計算した最終ハッシュと、署名から得たハッシュとを比較
if(!SVC_CompareSHA1((const void *)buf, (const void *)final_hash))
{
@ -1492,7 +1492,7 @@ static BOOL SYSMi_AuthenticateNTRDownloadTitle( TitleProperty *pBootTitle)
}
}
OS_TPrintf("Authenticate : total %d ms.\n", OS_TicksToMilliSeconds(OS_GetTick() - start) );
return TRUE;
}
@ -1719,18 +1719,28 @@ static BOOL SYSMi_AuthenticateNTRCardTitle( TitleProperty *pBootTitle)
// DHTチェックphase3 (バナーチェック)
OS_TPrintf("DHT Phase3...");
if ( !s_dht.hash3 || !DHT_CheckHashPhase3(s_dht.hash3, (NTRBannerFile*)&s_card_bannerBuf) )
if ( !s_dht.hash3 )
{
if(!s_b_dev){
// デバグ用。ERRORLOG_Init()がすでに呼ばれている事前提
ERRORLOG_Printf( "DHT_PAHSE3_FAILED (sub info): no database no hash\n" );
#ifndef SYSM_IGNORE_DHT_EX_NOT_FOUND
SYSM_Free(p2work);
UTL_SetFatalError(FATAL_ERROR_DHT_PHASE3_FAILED);
return FALSE;
#endif
}
}
else if ( !DHT_CheckHashPhase3(s_dht.hash3, (NTRBannerFile*)&s_card_bannerBuf) )
{
OS_TPrintf(" DHT Phase3 : Failed.\n");
if(!s_b_dev){
// デバグ用。ERRORLOG_Init()がすでに呼ばれている事前提
ERRORLOG_Printf( "DHT_PAHSE3_FAILED (sub info): hash3Addr-%08x\n", s_dht.hash3 );
#ifndef SYSM_IGNORE_DHT_EX_NOT_FOUND
#ifndef SYSM_IGNORE_DHT_PHASE_3
SYSM_Free(p2work);
UTL_SetFatalError(FATAL_ERROR_DHT_PHASE3_FAILED);
return FALSE;
#endif
#endif
}
}