From e76216fdb7ad8c941042fda589882a9e775f2013 Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Mon, 7 Jul 2008 04:21:22 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E3=81=AB?= =?UTF-8?q?=E6=8E=A5=E7=B6=9A=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8?= =?UTF-8?q?=E3=81=8D=E3=82=82DS=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=92=E4=B8=80=E9=80=9A=E3=82=8A=E8=A1=8C=E3=81=84?= =?UTF-8?q?=E3=80=81=E7=B5=90=E6=9E=9C=E3=81=A0=E3=81=91=E7=84=A1=E8=A6=96?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=20=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E7=B5=90=E6=9E=9C=E7=84=A1=E8=A6=96=E6=99=82?= =?UTF-8?q?=E3=80=81=E3=83=A1=E3=83=A2=E3=83=AA=E3=81=AE=E8=A7=A3=E6=94=BE?= =?UTF-8?q?=E3=82=92=E4=BA=8C=E9=87=8D=E3=81=AB=E8=A1=8C=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E8=90=BD=E3=81=A1=E3=81=A6=E3=81=84=E3=81=9F=E3=83=90=E3=82=B0?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1794 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/sysmenu/ARM9/src/title.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index cf3b6786..33e9b88c 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -1225,11 +1225,6 @@ void SYSM_ResumeLoadingThread( BOOL force ) static BOOL SYSMi_AuthenticateNTRCardAppHeader( TitleProperty *pBootTitle, ROM_Header *head ) { BOOL ret = TRUE; - // デバッガに接続してるときは適用しない - if( SYSM_IsRunOnDebugger() ) - { - return TRUE; - } #define DEV_WHITELIST_CHECK_SKIP #ifdef DEV_WHITELIST_CHECK_SKIP @@ -1292,18 +1287,12 @@ static BOOL SYSMi_AuthenticateNTRCardTitle( TitleProperty *pBootTitle) #pragma unused(pBootTitle) DHTPhase2Work* p2work; ROM_Header_Short *hs = ( ROM_Header_Short *)SYSM_APP_ROM_HEADER_BUF; - - // デバッガに接続してるときは適用しない - if( SYSM_IsRunOnDebugger() ) - { - return TRUE; - } // phase1最終検証 if(s_calc_hash) { // アプリをロードする時に計算したハッシュを検証 - if(!SVC_CompareSHA1((const void *)hash0, (const void *)&s_calc_hash[1 * SVC_SHA1_DIGEST_SIZE])) + if( !hash0 || !SVC_CompareSHA1( (const void *)hash0, (const void *)&s_calc_hash[1 * SVC_SHA1_DIGEST_SIZE] ) ) { OS_TPrintf("DHT Phase1 failed: hash check failed.\n"); if(!s_b_dev) { @@ -1322,15 +1311,15 @@ static BOOL SYSMi_AuthenticateNTRCardTitle( TitleProperty *pBootTitle) return FALSE; } } - + // DHTチェックphase2 OS_TPrintf("DHT Phase2..."); p2work = SYSM_Alloc( sizeof(DHTPhase2Work) ); if ( !hash1 || !DHT_CheckHashPhase2(hash1, hs, p2work, WrapperFunc_ReadCardData, NULL) ) { OS_TPrintf(" DHT Phase2 : Failed.\n"); - SYSM_Free(p2work); if(!s_b_dev){ + SYSM_Free(p2work); UTL_SetFatalError(FATAL_ERROR_DHT_PHASE2_FAILED); return FALSE; }