From c357efaf26616205fc24c327fcb9ee36181d2750 Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Thu, 28 Feb 2008 06:25:04 +0000 Subject: [PATCH] =?UTF-8?q?TMP=E3=82=A2=E3=83=97=E3=83=AA=E3=83=95?= =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C=20ROM?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=83=AD=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E4=B8=AD=E3=80=81=E3=83=98=E3=83=83?= =?UTF-8?q?=E3=83=80=E6=83=85=E5=A0=B1=E3=82=92=E3=82=AA=E3=83=95=E3=82=BB?= =?UTF-8?q?=E3=83=83=E3=83=88=E5=80=A4=E3=83=8F=E3=83=BC=E3=83=89=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=A7=E5=8F=82=E7=85=A7=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92=E6=95=B4=E7=90=86?= 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@762 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../sysmenu/ARM9/src/title.c | 57 ++++++++++++------- build/systemMenu_RED/Launcher/ARM9/src/main.c | 1 + 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 489723a8..1bac42a3 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -428,7 +428,7 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", header, 0, s return; } - if( header[0x15C] != 0x56 || header[0x15D] != 0xCF ) + if( head->s.nintendo_logo_crc16 != 0xCF56 ) { int i, j; for( i = 0; i < 0x20; ++i ) @@ -444,10 +444,9 @@ OS_TPrintf("RebootSystem failed: logo CRC error\n"); return; } - - if( !(header[0x12] & 0x03) ) + if( !(head->s.platform_code & PLATFORM_CODE_FLAG_TWL) ) { - //NTR専用ROM + //NTR専用ROM or NTR TWL両方非対応のアプリ isTwlApp = FALSE; if( pBootTitle->flags.bootType == LAUNCHER_BOOTTYPE_TEMP) { @@ -476,23 +475,23 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, length [region_header ] = HW_TWL_ROM_HEADER_BUF_SIZE; destaddr[region_header ] = HW_TWL_ROM_HEADER_BUF; - source [region_arm9_ntr] = *(const u32*)&header[0x020]; - length [region_arm9_ntr] = *(const u32*)&header[0x02C]; - destaddr[region_arm9_ntr] = *(const u32*)&header[0x028]; + source [region_arm9_ntr] = head->s.main_rom_offset; + length [region_arm9_ntr] = head->s.main_size; + destaddr[region_arm9_ntr] = (u32)head->s.main_ram_address; - source [region_arm7_ntr] = *(const u32*)&header[0x030]; - length [region_arm7_ntr] = *(const u32*)&header[0x03C]; - destaddr[region_arm7_ntr] = *(const u32*)&header[0x038]; + source [region_arm7_ntr] = head->s.sub_rom_offset; + length [region_arm7_ntr] = head->s.sub_size; + destaddr[region_arm7_ntr] = (u32)head->s.sub_ram_address; if( isTwlApp ) { - source [region_arm9_twl] = *(const u32*)&header[0x1C0]; - length [region_arm9_twl] = *(const u32*)&header[0x1CC]; - destaddr[region_arm9_twl] = *(const u32*)&header[0x1C8]; + source [region_arm9_twl] = head->s.main_ltd_rom_offset; + length [region_arm9_twl] = head->s.main_ltd_size; + destaddr[region_arm9_twl] = (u32)head->s.main_ltd_ram_address; - source [region_arm7_twl] = *(const u32*)&header[0x1D0]; - length [region_arm7_twl] = *(const u32*)&header[0x1DC]; - destaddr[region_arm7_twl] = *(const u32*)&header[0x1D8]; + source [region_arm7_twl] = head->s.sub_ltd_rom_offset; + length [region_arm7_twl] = head->s.sub_ltd_size; + destaddr[region_arm7_twl] = (u32)head->s.sub_ltd_ram_address; } // 領域読み込み先のチェック及び再配置情報データの作成 @@ -674,7 +673,7 @@ static AuthResult SYSMi_AuthenticateTWLHeader( TitleProperty *pBootTitle ) // 署名処理 { const u8 *key; - u16 prop; + u32 hi; u8 keynum; u8 buf[0x80]; u8 calculated_hash[SVC_SHA1_DIGEST_SIZE]; @@ -700,9 +699,8 @@ static AuthResult SYSMi_AuthenticateTWLHeader( TitleProperty *pBootTitle ) } prev = OS_GetTick(); - prop = ((u16 *)&(pBootTitle->titleID))[2]; - prop = (u16)(prop & 0x3); // prop = 0:UserApp 1:SystemApp 2:ShopApp? - keynum = (u8)( prop == 0 ? 2 : (prop == 1 ? 0 : 1) );// keynum = 0:SystemApp 1:ShopApp 2:UserApp + hi = head->s.titleID_Hi; + keynum = (u8)( (hi & TITLE_ID_SECURE_FLAG_MASK) ? 1 : ( (hi & TITLE_ID_HI_APP_TYPE_MASK) ? 0 : 2 ) ); // keynum = 0:SystemApp 1:SecureApp 2:UserApp // アプリ種別とボンディングオプションによって使う鍵を分ける // #define LNC_PDTKEY_DBG #ifdef LNC_PDTKEY_DBG @@ -922,8 +920,9 @@ static AuthResult SYSMi_AuthenticateNTRDownloadAppHeader( TitleProperty *pBootTi // ヘッダ認証 static AuthResult SYSMi_AuthenticateHeader( TitleProperty *pBootTitle) { + ROM_Header_Short *hs = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF; // [TODO:]認証結果はどこかワークに保存しておく - if( ( (( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF)->platform_code ) != 0 ) + if( hs->platform_code & PLATFORM_CODE_FLAG_TWL ) { // TWLアプリ switch( pBootTitle->flags.bootType ) @@ -936,6 +935,11 @@ static AuthResult SYSMi_AuthenticateHeader( TitleProperty *pBootTitle) return SYSMi_AuthenticateTWLHeader( pBootTitle ); case LAUNCHER_BOOTTYPE_TEMP: OS_TPrintf( "Authenticate :TWL_TEMP start.\n" ); + if (!hs->permit_tmp_jump) + { + OS_TPrintf("Authenticate failed: TMP flag error.\n"); + return AUTH_RESULT_AUTHENTICATE_FAILED; + } return SYSMi_AuthenticateTWLHeader( pBootTitle ); default: return AUTH_RESULT_AUTHENTICATE_FAILED; @@ -943,6 +947,12 @@ static AuthResult SYSMi_AuthenticateHeader( TitleProperty *pBootTitle) } else { + if( hs->platform_code & PLATFORM_CODE_FLAG_NOT_NTR ) + { + // TWLでもNTRでもない不正なアプリ + OS_TPrintf( "Authenticate :NOT NTR NOT TWL.\n" ); + return AUTH_RESULT_AUTHENTICATE_FAILED; + } // NTRアプリ switch( pBootTitle->flags.bootType ) { @@ -951,6 +961,11 @@ static AuthResult SYSMi_AuthenticateHeader( TitleProperty *pBootTitle) return SYSMi_AuthenticateNTRNandAppHeader( pBootTitle ); case LAUNCHER_BOOTTYPE_TEMP: OS_TPrintf( "Authenticate :NTR_TEMP start.\n" ); + if (!hs->permit_tmp_jump) + { + OS_TPrintf("Authenticate failed: TMP flag error.\n"); + return AUTH_RESULT_AUTHENTICATE_FAILED; + } return SYSMi_AuthenticateNTRDownloadAppHeader( pBootTitle ); case LAUNCHER_BOOTTYPE_ROM: OS_TPrintf( "Authenticate :NTR_ROM start.\n" ); diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 745542e6..32df4363 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -274,6 +274,7 @@ void TwlMain( void ) case AUTH_RESULT_AUTHENTICATE_FAILED: case AUTH_RESULT_ENTRY_ADDRESS_ERROR: state = STOP; + // [TODO:]クリアしたほうが良いデータ（鍵など）があれば消す break; } }