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

デバッガからTLFを読み込めない件の修正（すべて僕の不始末でしたスミマセン……orz

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1440 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2008-05-21 07:24:57 +00:00
parent 2f2e69823a
commit 593d57c2ec
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,6 @@
#include <sysmenu/dht/dht.h> #include <sysmenu/dht/dht.h>
#define DS_HASH_TABLE_SIZE (256*1024) #define DS_HASH_TABLE_SIZE (256*1024)
static u8 dht_buffer[DS_HASH_TABLE_SIZE] ATTRIBUTE_ALIGN(256);
static DHTFile *const dht = (DHTFile*)dht_buffer;
static const u8* hash0;
static const u8* hash1;
typedef struct MbAuthCode typedef struct MbAuthCode
{ {
@ -99,6 +95,12 @@ static NAMTitleId *s_pTitleIDList = NULL;
static int s_listLength = 0; static int s_listLength = 0;
static u8 *s_calc_hash = NULL; static u8 *s_calc_hash = NULL;
static BOOL s_b_dev = FALSE;
static u8 dht_buffer[DS_HASH_TABLE_SIZE] ATTRIBUTE_ALIGN(256);
static DHTFile *const dht = (DHTFile*)dht_buffer;
static const u8* hash0;
static const u8* hash1;
// const data------------------------------------------------------------------ // const data------------------------------------------------------------------
static const OSBootType s_launcherToOSBootType[ LAUNCHER_BOOTTYPE_MAX ] = { static const OSBootType s_launcherToOSBootType[ LAUNCHER_BOOTTYPE_MAX ] = {
@ -900,7 +902,6 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
u8 keynum; u8 keynum;
SignatureData sigbuf; SignatureData sigbuf;
SVCSignHeapContext con; SVCSignHeapContext con;
BOOL b_dev = FALSE;
char *gamecode = (char *)&(pBootTitle->titleID); char *gamecode = (char *)&(pBootTitle->titleID);
OSTick start,prev; OSTick start,prev;
start = OS_GetTick(); start = OS_GetTick();
@ -918,6 +919,9 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
: ( (hi & TITLE_ID_HI_APP_TYPE_MASK) ? SYSTEM_APP_KEY_INDEX : USER_APP_KEY_INDEX ) : ( (hi & TITLE_ID_HI_APP_TYPE_MASK) ? SYSTEM_APP_KEY_INDEX : USER_APP_KEY_INDEX )
); );
} }
s_b_dev = FALSE;
// アプリ種別とボンディングオプションによって使う鍵を分ける // アプリ種別とボンディングオプションによって使う鍵を分ける
//#define LNC_PDTKEY_DBG //#define LNC_PDTKEY_DBG
#ifdef LNC_PDTKEY_DBG #ifdef LNC_PDTKEY_DBG
@ -936,7 +940,7 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
// デバッガが有効でTLF読み込みならば、ハッシュチェックスルーフラグを立てる // デバッガが有効でTLF読み込みならば、ハッシュチェックスルーフラグを立てる
if(SYSMi_GetWork()->flags.hotsw.isOnDebugger && SYSMi_GetWork()->romEmuInfo.isTlfRom ) if(SYSMi_GetWork()->flags.hotsw.isOnDebugger && SYSMi_GetWork()->romEmuInfo.isTlfRom )
{ {
b_dev = TRUE; s_b_dev = TRUE;
} }
} }
#else #else
@ -949,7 +953,7 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
// デバッガが有効でTLF読み込みならば、ハッシュチェックスルーフラグを立てる // デバッガが有効でTLF読み込みならば、ハッシュチェックスルーフラグを立てる
if(SYSMi_GetWork()->flags.hotsw.isOnDebugger && SYSMi_GetWork()->romEmuInfo.isTlfRom ) if(SYSMi_GetWork()->flags.hotsw.isOnDebugger && SYSMi_GetWork()->romEmuInfo.isTlfRom )
{ {
b_dev = TRUE; s_b_dev = TRUE;
} }
} }
#endif #endif
@ -959,7 +963,7 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
if( !SVC_DecryptSign( &con, sigbuf.digest, head->signature, key )) if( !SVC_DecryptSign( &con, sigbuf.digest, head->signature, key ))
{ {
OS_TPrintf("Authenticate_Header failed: Sign decryption failed.\n"); OS_TPrintf("Authenticate_Header failed: Sign decryption failed.\n");
if(!b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED; if(!s_b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED;
} }
if(s_calc_hash) if(s_calc_hash)
{ {
@ -967,7 +971,7 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
if(!SVC_CompareSHA1(sigbuf.digest, (const void *)&s_calc_hash[0])) if(!SVC_CompareSHA1(sigbuf.digest, (const void *)&s_calc_hash[0]))
{ {
OS_TPrintf("Authenticate_Header failed: Sign check failed.\n"); OS_TPrintf("Authenticate_Header failed: Sign check failed.\n");
if(!b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED; if(!s_b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED;
}else }else
{ {
OS_TPrintf("Authenticate_Header : Sign check succeed. %dms.\n", OS_TicksToMilliSeconds(OS_GetTick() - prev)); OS_TPrintf("Authenticate_Header : Sign check succeed. %dms.\n", OS_TicksToMilliSeconds(OS_GetTick() - prev));
@ -975,7 +979,7 @@ static AuthResult SYSMi_AuthenticateHeaderWithSign( TitleProperty *pBootTitle, R
}else }else
{ {
OS_TPrintf("Authenticate_Header failed: Sign calc failed.\n"); OS_TPrintf("Authenticate_Header failed: Sign calc failed.\n");
if(!b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED; if(!s_b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED;
} }
OS_TPrintf("Authenticate_Header : total %d ms.\n", OS_TicksToMilliSeconds(OS_GetTick() - start) ); OS_TPrintf("Authenticate_Header : total %d ms.\n", OS_TicksToMilliSeconds(OS_GetTick() - start) );
@ -1040,7 +1044,6 @@ static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
u32 module_size[RELOCATE_INFO_NUM]; u32 module_size[RELOCATE_INFO_NUM];
u8 *hash_addr[RELOCATE_INFO_NUM]; u8 *hash_addr[RELOCATE_INFO_NUM];
int module_num; int module_num;
BOOL b_dev = FALSE;
char *gamecode = (char *)&(pBootTitle->titleID); char *gamecode = (char *)&(pBootTitle->titleID);
// それぞれARM9,7のFLXおよびLTDについてハッシュを計算してヘッダに格納されているハッシュと比較 // それぞれARM9,7のFLXおよびLTDについてハッシュを計算してヘッダに格納されているハッシュと比較
@ -1075,7 +1078,7 @@ static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
if(!SVC_CompareSHA1((const void *)hash_addr[l], (const void *)&s_calc_hash[(l+1) * SVC_SHA1_DIGEST_SIZE])) if(!SVC_CompareSHA1((const void *)hash_addr[l], (const void *)&s_calc_hash[(l+1) * SVC_SHA1_DIGEST_SIZE]))
{ {
OS_TPrintf("Authenticate failed: %s module hash check failed.\n", str[l]); OS_TPrintf("Authenticate failed: %s module hash check failed.\n", str[l]);
if(!b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED; if(!s_b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED;
}else }else
{ {
OS_TPrintf("Authenticate : %s module hash check succeed. %dms.\n", str[l], OS_TicksToMilliSeconds(OS_GetTick() - prev)); OS_TPrintf("Authenticate : %s module hash check succeed. %dms.\n", str[l], OS_TicksToMilliSeconds(OS_GetTick() - prev));
@ -1083,7 +1086,7 @@ static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle )
}else }else
{ {
OS_TPrintf("Authenticate failed: %s module hash calc failed.\n", str[l]); OS_TPrintf("Authenticate failed: %s module hash calc failed.\n", str[l]);
if(!b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED; if(!s_b_dev) return AUTH_RESULT_AUTHENTICATE_FAILED;
} }
} }
} }