diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 2a0edead..2af8f79a 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -69,7 +69,6 @@ SYSMENU_LIBS ?= \ libsysmenu$(TWL_LIBSUFFIX).a \ libsysmmcu$(TWL_LIBSUFFIX).a \ libmbloader$(TWL_LIBSUFFIX).a \ - libacsign$(TWL_LIBSUFFIX).a \ libboot$(TWL_LIBSUFFIX).a \ libds$(TWL_LIBSUFFIX).a \ diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index b68b8974..f1a5ddf9 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -44,7 +44,8 @@ SRCS = main.c HWInfoWriter.c hwi.c \ LINCLUDES = $(MISC_DIR)/include \ $(ROOT)/build/libraries/lcfg/ARM9.TWL/include -LLIBRARIES = libacsign_enc$(TWL_LIBSUFFIX).a +LLIBRARIES = libacsign$(TWL_LIBSUFFIX).a \ + libacsign_enc$(TWL_LIBSUFFIX).a ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) ifdef USE_PRODUCT_KEY @@ -65,6 +66,8 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe +GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES)) + LDIRT_CLEAN = $(TARGET_TAD) INSTALL_TARGETS = $(TARGET_TAD) INSTALL_DIR = $(SDK_NMENU_DATADIR) diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c index 20fb681c..533b93f2 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c @@ -17,15 +17,16 @@ #include #include +#include #include "TWLHWInfo_api.h" #include "TWLSettings_api.h" #include "hwi.h" // define data------------------------------------------ -#ifdef USE_PRODUCT_KEY // 鍵選択スイッチ -#define HWINFO_PRIVKEY_PATH "rom:key/private_HWInfo.der" // 製品用秘密鍵 +#ifdef USE_PRODUCT_KEY // 鍵選択スイッチ +#define HWINFO_PRIVKEY_PATH "rom:key/private_HWInfo.der" // 製品用秘密鍵 #else -#define HWINFO_PRIVKEY_PATH "rom:key/private_HWInfo_dev.der" // 開発用秘密鍵 +#define HWINFO_PRIVKEY_PATH "rom:key/private_HWInfo_dev.der" // 開発用秘密鍵 #endif // extern data------------------------------------------ @@ -52,32 +53,32 @@ static void (*spFree)( void *ptr ); // const data ----------------------------------------- static const u32 s_langBitmapList[ OS_TWL_REGION_MAX ] = { - LCFG_TWL_LANG_BITMAP_JAPAN, - LCFG_TWL_LANG_BITMAP_AMERICA, - LCFG_TWL_LANG_BITMAP_EUROPE, - LCFG_TWL_LANG_BITMAP_AUSTRALIA, - LCFG_TWL_LANG_BITMAP_CHINA, - LCFG_TWL_LANG_BITMAP_KOREA, + LCFG_TWL_LANG_BITMAP_JAPAN, + LCFG_TWL_LANG_BITMAP_AMERICA, + LCFG_TWL_LANG_BITMAP_EUROPE, + LCFG_TWL_LANG_BITMAP_AUSTRALIA, + LCFG_TWL_LANG_BITMAP_CHINA, + LCFG_TWL_LANG_BITMAP_KOREA, }; static char *strLanguage[] = { - (char *)"LANG_JAPANESE", - (char *)"LANG_ENGLISH", - (char *)"LANG_FRENCH", - (char *)"LANG_GERMAN", - (char *)"LANG_ITALIAN", - (char *)"LANG_SPANISH", - (char *)"LANG_CHINESE", - (char *)"LANG_KOREAN", + (char *)"LANG_JAPANESE", + (char *)"LANG_ENGLISH", + (char *)"LANG_FRENCH", + (char *)"LANG_GERMAN", + (char *)"LANG_ITALIAN", + (char *)"LANG_SPANISH", + (char *)"LANG_CHINESE", + (char *)"LANG_KOREAN", }; static const char *strLauncherGameCode[] = { - "LNCJ", - "LNCE", - "LNCP", - "LNCO", - "LNCC", - "LNCK", + "LNCJ", + "LNCE", + "LNCP", + "LNCO", + "LNCC", + "LNCK", }; //====================================================== @@ -89,149 +90,149 @@ static const char *strLauncherGameCode[] = { Description: HW情報ライターの初期化 - Arguments: + Arguments: Returns: None. *---------------------------------------------------------------------------*/ HwiInitResult HWI_Init( void *(*pAlloc)( u32 ), void (*pFree)( void * ) ) { - HwiInitResult result; + HwiInitResult result; - spAlloc = pAlloc; - spFree = pFree; + spAlloc = pAlloc; + spFree = pFree; - ACSign_SetAllocFunc( pAlloc, pFree ); - result = ReadPrivateKey(); - ReadHWInfoFile(); -// VerifyHWInfo(); - if( 1 ) { - u8 sign[ RSA_KEY_LENGTH ]; - if( !LCFG_ReadHWID_Signature( sign ) || - !LCFG_CheckHWID_Signature( sign ) - ) { - OS_TPrintf( "HWID Signature check failed.\n" ); - }else { - OS_TPrintf( "HWID Signature check succeeded.\n" ); - } - } - // ※LanguageBitmapを判定で使用するので、必ずReadHWInfoの後で実行する必要がある。 - ReadTWLSettings(); - - return result; + ACSign_SetAllocFunc( pAlloc, pFree ); + result = ReadPrivateKey(); + ReadHWInfoFile(); +// VerifyHWInfo(); + if( 1 ) { + u8 sign[ RSA_KEY_LENGTH ]; + if( !LCFG_ReadHWID_Signature( sign ) || + !LCFG_CheckHWID_Signature( sign ) + ) { + OS_TPrintf( "HWID Signature check failed.\n" ); + }else { + OS_TPrintf( "HWID Signature check succeeded.\n" ); + } + } + // ※LanguageBitmapを判定で使用するので、必ずReadHWInfoの後で実行する必要がある。 + ReadTWLSettings(); + + return result; } // TWL設定データのリード static void ReadTWLSettings( void ) { - u8 *pBuffer = spAlloc( LCFG_READ_TEMP ); - s_isReadTSD = FALSE; - if( pBuffer ) { - s_isReadTSD = LCFG_ReadTWLSettings( (u8 (*)[ LCFG_READ_TEMP ] )pBuffer ); - spFree( pBuffer ); - } - if( s_isReadTSD ) { - OS_TPrintf( "TSD read succeeded.\n" ); - }else { - OS_TPrintf( "TSD read failed.\n" ); - } + u8 *pBuffer = spAlloc( LCFG_READ_TEMP ); + s_isReadTSD = FALSE; + if( pBuffer ) { + s_isReadTSD = LCFG_ReadTWLSettings( (u8 (*)[ LCFG_READ_TEMP ] )pBuffer ); + spFree( pBuffer ); + } + if( s_isReadTSD ) { + OS_TPrintf( "TSD read succeeded.\n" ); + }else { + OS_TPrintf( "TSD read failed.\n" ); + } } // 秘密鍵のリード HwiInitResult ReadPrivateKey( void ) { - BOOL result = FALSE; - u32 keyLength; - FSFile file; - OSTick start = OS_GetTick(); - - FS_InitFile( &file ); - if( !FS_OpenFileEx( &file, HWINFO_PRIVKEY_PATH, FS_FILEMODE_R ) ) - { - OS_TPrintf( "PrivateKey read failed.\n" ); - } - else - { - keyLength = FS_GetFileLength( &file ); - if( keyLength > 0 ) { - s_pPrivKeyBuffer = spAlloc( keyLength ); - if( FS_ReadFile( &file, s_pPrivKeyBuffer, (s32)keyLength ) == keyLength ) { - OS_TPrintf( "PrivateKey read succeeded.\n" ); - result = TRUE; - }else { - OS_TPrintf( "PrivateKey read failed.\n" ); - } - } - FS_CloseFile( &file ); - } - - if( !result && s_pPrivKeyBuffer ) { - spFree( s_pPrivKeyBuffer ); - s_pPrivKeyBuffer = NULL; - } - OS_TPrintf( "PrivKey read time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); - - if (result) { + BOOL result = FALSE; + u32 keyLength; + FSFile file; + OSTick start = OS_GetTick(); + + FS_InitFile( &file ); + if( !FS_OpenFileEx( &file, HWINFO_PRIVKEY_PATH, FS_FILEMODE_R ) ) + { + OS_TPrintf( "PrivateKey read failed.\n" ); + } + else + { + keyLength = FS_GetFileLength( &file ); + if( keyLength > 0 ) { + s_pPrivKeyBuffer = spAlloc( keyLength ); + if( FS_ReadFile( &file, s_pPrivKeyBuffer, (s32)keyLength ) == keyLength ) { + OS_TPrintf( "PrivateKey read succeeded.\n" ); + result = TRUE; + }else { + OS_TPrintf( "PrivateKey read failed.\n" ); + } + } + FS_CloseFile( &file ); + } + + if( !result && s_pPrivKeyBuffer ) { + spFree( s_pPrivKeyBuffer ); + s_pPrivKeyBuffer = NULL; + } + OS_TPrintf( "PrivKey read time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); + + if (result) { #ifdef USE_PRODUCT_KEY - return HWI_INIT_SUCCESS_PRO_SIGNATURE_MODE; + return HWI_INIT_SUCCESS_PRO_SIGNATURE_MODE; #else - return HWI_INIT_SUCCESS_DEV_SIGNATURE_MODE; + return HWI_INIT_SUCCESS_DEV_SIGNATURE_MODE; #endif - }else { - return HWI_INIT_SUCCESS_NO_SIGNATRUE_MODE; - } + }else { + return HWI_INIT_SUCCESS_NO_SIGNATRUE_MODE; + } } // HW情報全体のリード static void ReadHWInfoFile( void ) { - LCFGReadResult retval; - OSTick start = OS_GetTick(); - - retval = LCFGi_THW_ReadNormalInfo(); - if( retval == LCFG_TSF_READ_RESULT_SUCCEEDED ) { - OS_TPrintf( "HW Normal Info read succeeded.\n" ); - }else { - OS_TPrintf( "HW Normal Info read failed.\n" ); - } - - OS_TPrintf( "HW Normal Info read time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); - - start = OS_GetTick(); - retval = LCFGi_THW_ReadSecureInfo(); - if( retval == LCFG_TSF_READ_RESULT_SUCCEEDED ) { - OS_TPrintf( "HW Secure Info read succeeded.\n" ); - }else { - OS_TPrintf( "HW Secure Info read failed.\n" ); - } - OS_TPrintf( "HW Secure Info read time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); + LCFGReadResult retval; + OSTick start = OS_GetTick(); + + retval = LCFGi_THW_ReadNormalInfo(); + if( retval == LCFG_TSF_READ_RESULT_SUCCEEDED ) { + OS_TPrintf( "HW Normal Info read succeeded.\n" ); + }else { + OS_TPrintf( "HW Normal Info read failed.\n" ); + } + + OS_TPrintf( "HW Normal Info read time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); + + start = OS_GetTick(); + retval = LCFGi_THW_ReadSecureInfo(); + if( retval == LCFG_TSF_READ_RESULT_SUCCEEDED ) { + OS_TPrintf( "HW Secure Info read succeeded.\n" ); + }else { + OS_TPrintf( "HW Secure Info read failed.\n" ); + } + OS_TPrintf( "HW Secure Info read time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); } // HWInfoファイルのベリファイ static void VerifyHWInfo( void ) { - if( VerifyData( (const u8 *)LCFG_THW_GetNormalInfo(), (const u8 *)LCFG_THW_GetDefaultNormalInfo(), sizeof(LCFGTWLHWNormalInfo) ) ) { - OS_TPrintf( "HW normal Info verify succeeded.\n" ); - }else { - OS_TPrintf( "HW normal Info verify failed.\n" ); - } - if( VerifyData( (const u8 *)LCFG_THW_GetSecureInfo(), (const u8 *)LCFG_THW_GetDefaultSecureInfo(), sizeof(LCFGTWLHWSecureInfo) ) ) { - OS_TPrintf( "HW secure Info verify succeeded.\n" ); - }else { - OS_TPrintf( "HW secure Info verify failed.\n" ); - } + if( VerifyData( (const u8 *)LCFG_THW_GetNormalInfo(), (const u8 *)LCFG_THW_GetDefaultNormalInfo(), sizeof(LCFGTWLHWNormalInfo) ) ) { + OS_TPrintf( "HW normal Info verify succeeded.\n" ); + }else { + OS_TPrintf( "HW normal Info verify failed.\n" ); + } + if( VerifyData( (const u8 *)LCFG_THW_GetSecureInfo(), (const u8 *)LCFG_THW_GetDefaultSecureInfo(), sizeof(LCFGTWLHWSecureInfo) ) ) { + OS_TPrintf( "HW secure Info verify succeeded.\n" ); + }else { + OS_TPrintf( "HW secure Info verify failed.\n" ); + } } // メモリ上のデータベリファイ static BOOL VerifyData( const u8 *pTgt, const u8 *pOrg, u32 len ) { - while( len-- ) { - if( *pTgt++ != *pOrg++ ) { - return FALSE; - } - } - return TRUE; + while( len-- ) { + if( *pTgt++ != *pOrg++ ) { + return FALSE; + } + } + return TRUE; } /*---------------------------------------------------------------------------* @@ -239,49 +240,49 @@ static BOOL VerifyData( const u8 *pTgt, const u8 *pOrg, u32 len ) Description: 言語コードをリージョン値に合わせて修正する。 - Arguments: + Arguments: Returns: None. *---------------------------------------------------------------------------*/ void HWI_ModifyLanguage( u8 region ) { #pragma unused( region ) - u32 langBitmap = LCFG_THW_GetValidLanguageBitmap(); - u8 nowLanguage = LCFG_TSD_GetLanguage(); - - // TSDが読み込めていないなら、何もせずリターン - if( !s_isReadTSD ) { - return; - } - - if( langBitmap & ( 0x0001 << nowLanguage ) ) { - OS_TPrintf( "Language no change.\n" ); - }else { - int i; - for( i = 0; i < LCFG_TWL_LANG_CODE_MAX; i++ ) { - if( langBitmap & ( 0x0001 << i ) ) { - break; - } - } - LCFG_TSD_SetLanguage( (LCFGTWLLangCode)i ); - OS_TPrintf( "Language Change \"%s\" -> \"%s\"\n", - strLanguage[ nowLanguage ], strLanguage[ LCFG_TSD_GetLanguage() ] ); - } - - // 国コードもクリアしておく。 - LCFG_TSD_SetCountry( LCFG_TWL_COUNTRY_UNDEFINED ); - - // ペアレンタルコントロール情報もクリアしておく - MI_CpuClearFast( (void *)LCFG_TSD_GetPCTLPtr(), sizeof(LCFGTWLParentalControl) ); - - // regionが変わった場合は、LANGUAGE_BITMAPも必ず変わるので、それをNTR側に反映させるために必ずTWL設定データの書き込みも行う。 - { - u8 *pBuffer = spAlloc( LCFG_WRITE_TEMP ); - if( pBuffer ) { - (void)LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer ); - spFree( pBuffer ); - } - } + u32 langBitmap = LCFG_THW_GetValidLanguageBitmap(); + u8 nowLanguage = LCFG_TSD_GetLanguage(); + + // TSDが読み込めていないなら、何もせずリターン + if( !s_isReadTSD ) { + return; + } + + if( langBitmap & ( 0x0001 << nowLanguage ) ) { + OS_TPrintf( "Language no change.\n" ); + }else { + int i; + for( i = 0; i < LCFG_TWL_LANG_CODE_MAX; i++ ) { + if( langBitmap & ( 0x0001 << i ) ) { + break; + } + } + LCFG_TSD_SetLanguage( (LCFGTWLLangCode)i ); + OS_TPrintf( "Language Change \"%s\" -> \"%s\"\n", + strLanguage[ nowLanguage ], strLanguage[ LCFG_TSD_GetLanguage() ] ); + } + + // 国コードもクリアしておく。 + LCFG_TSD_SetCountry( LCFG_TWL_COUNTRY_UNDEFINED ); + + // ペアレンタルコントロール情報もクリアしておく + MI_CpuClearFast( (void *)LCFG_TSD_GetPCTLPtr(), sizeof(LCFGTWLParentalControl) ); + + // regionが変わった場合は、LANGUAGE_BITMAPも必ず変わるので、それをNTR側に反映させるために必ずTWL設定データの書き込みも行う。 + { + u8 *pBuffer = spAlloc( LCFG_WRITE_TEMP ); + if( pBuffer ) { + (void)LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer ); + spFree( pBuffer ); + } + } } /*---------------------------------------------------------------------------* @@ -289,59 +290,59 @@ void HWI_ModifyLanguage( u8 region ) Description: HWノーマルInfoファイルのライト - Arguments: + Arguments: Returns: None. *---------------------------------------------------------------------------*/ BOOL HWI_WriteHWNormalInfoFile( void ) { const char* CAMERA_VOLATILE_INFO_PATH = "rom:/data/camera_volatile_info.bin"; - LCFGTWLHWNormalInfo Info; + LCFGTWLHWNormalInfo Info; FSFile file; - LCFGReadResult result; + LCFGReadResult result; BOOL open_is_ok; - BOOL read_is_ok; + BOOL read_is_ok; - result = LCFGi_THW_ReadNormalInfo(); - if( result != LCFG_TSF_READ_RESULT_SUCCEEDED ) { - if( !LCFGi_THW_RecoveryNormalInfo( result ) ) { - OS_TPrintf( "HW Normal Info Recovery failed.\n" ); - return FALSE; - } - } + result = LCFGi_THW_ReadNormalInfo(); + if( result != LCFG_TSF_READ_RESULT_SUCCEEDED ) { + if( !LCFGi_THW_RecoveryNormalInfo( result ) ) { + OS_TPrintf( "HW Normal Info Recovery failed.\n" ); + return FALSE; + } + } - Info.rtcAdjust = LCFG_THW_GetRTCAdjust(); + Info.rtcAdjust = LCFG_THW_GetRTCAdjust(); - // ROMファイルオープン(カメラ情報） + // ROMファイルオープン(カメラ情報） FS_InitFile(&file); open_is_ok = FS_OpenFile(&file, CAMERA_VOLATILE_INFO_PATH); - if (!open_is_ok) - { - OS_Printf("FS_OpenFile(\"%s\") ... ERROR!\n", CAMERA_VOLATILE_INFO_PATH); - return FALSE; - } - - // ROMファイルリード - read_is_ok = FS_ReadFile( &file, Info.camera, (s32)sizeof( Info.camera ) ); - if (!read_is_ok) - { - OS_Printf("FS_ReadFile(\"%s\") ... ERROR!\n", CAMERA_VOLATILE_INFO_PATH); - FS_CloseFile(&file); - return FALSE; - } + if (!open_is_ok) + { + OS_Printf("FS_OpenFile(\"%s\") ... ERROR!\n", CAMERA_VOLATILE_INFO_PATH); + return FALSE; + } - FS_FlushFile(&file); + // ROMファイルリード + read_is_ok = FS_ReadFile( &file, Info.camera, (s32)sizeof( Info.camera ) ); + if (!read_is_ok) + { + OS_Printf("FS_ReadFile(\"%s\") ... ERROR!\n", CAMERA_VOLATILE_INFO_PATH); + FS_CloseFile(&file); + return FALSE; + } - // ROMファイルクローズ - FS_CloseFile(&file); + FS_FlushFile(&file); - if (!LCFGi_THW_WriteNormalInfoDirect( &Info )) - { - OS_TPrintf( "HW Normal Info Write failed.\n" ); - return FALSE; - } - - return TRUE; + // ROMファイルクローズ + FS_CloseFile(&file); + + if (!LCFGi_THW_WriteNormalInfoDirect( &Info )) + { + OS_TPrintf( "HW Normal Info Write failed.\n" ); + return FALSE; + } + + return TRUE; } /*---------------------------------------------------------------------------* @@ -349,70 +350,70 @@ BOOL HWI_WriteHWNormalInfoFile( void ) Description: HWセキュアInfoファイルのライト - Arguments: + Arguments: Returns: None. *---------------------------------------------------------------------------*/ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWireless ) { - BOOL isWrite = TRUE; - LCFGReadResult result; - - // ファイルのリード - result = LCFGi_THW_ReadSecureInfo(); - - // リードに失敗したらリカバリ - if( result != LCFG_TSF_READ_RESULT_SUCCEEDED ) { - if( !LCFGi_THW_RecoverySecureInfo( result ) ) { - OS_TPrintf( "HW Secure Info Recovery failed.\n" ); - isWrite = FALSE; - } - } + BOOL isWrite = TRUE; + LCFGReadResult result; - LCFG_THW_SetFlagForceDisableWireless( isDisableWireless ); - // リージョンのセット - LCFG_THW_SetRegion( region ); - - // 対応言語ビットマップのセット - LCFG_THW_SetValidLanguageBitmap( s_langBitmapList[ region ] ); - - // シリアルNo.のセット - if( pSerialNo == NULL ) { - // 量産工程でないとシリアルNo.は用意できないので、ここではMACアドレスをもとに適当な値をセットする。 - u8 buffer[ 12 ] = "SERIAL"; // 適当な文字列をMACアドレスと結合してSHA1を取り、仮SerialNoとする。 - u8 serialNo[ SVC_SHA1_DIGEST_SIZE ]; - int i; - int len = ( LCFG_THW_GetRegion() == OS_TWL_REGION_AMERICA ) ? - LCFG_TWL_HWINFO_SERIALNO_LEN_AMERICA : LCFG_TWL_HWINFO_SERIALNO_LEN_OTHERS; - OS_GetMacAddress( buffer + 6 ); - SVC_CalcSHA1( serialNo, buffer, sizeof(buffer) ); - for( i = 3; i < SVC_SHA1_DIGEST_SIZE; i++ ) { - serialNo[ i ] = (u8)( ( serialNo[ i ] % 10 ) + 0x30 ); - } - MI_CpuCopy8( "SRN", serialNo, 3 ); - MI_CpuClear8( &serialNo[ len ], sizeof(serialNo) - len ); -// OS_TPrintf( "serialNo : %s\n", serialNo ); - LCFG_THW_SetSerialNo( serialNo ); - }else { - LCFG_THW_SetSerialNo( pSerialNo ); - } - - // ランチャーTitleID_Loのセット - { - int i; - u8 titleID_Lo[4]; - for( i = 0; i < 4; i++ ) titleID_Lo[ i ] = (u8)strLauncherGameCode[ region ][ 4 - i - 1 ]; - LCFG_THW_SetLauncherTitleID_Lo( (const u8 *)titleID_Lo ); - } - - // ライト - if( isWrite && - !LCFGi_THW_WriteSecureInfo( s_pPrivKeyBuffer ) ) { - isWrite = FALSE; - OS_TPrintf( "HW Secure Info Write failed.\n" ); - } - - return isWrite; + // ファイルのリード + result = LCFGi_THW_ReadSecureInfo(); + + // リードに失敗したらリカバリ + if( result != LCFG_TSF_READ_RESULT_SUCCEEDED ) { + if( !LCFGi_THW_RecoverySecureInfo( result ) ) { + OS_TPrintf( "HW Secure Info Recovery failed.\n" ); + isWrite = FALSE; + } + } + + LCFG_THW_SetFlagForceDisableWireless( isDisableWireless ); + // リージョンのセット + LCFG_THW_SetRegion( region ); + + // 対応言語ビットマップのセット + LCFG_THW_SetValidLanguageBitmap( s_langBitmapList[ region ] ); + + // シリアルNo.のセット + if( pSerialNo == NULL ) { + // 量産工程でないとシリアルNo.は用意できないので、ここではMACアドレスをもとに適当な値をセットする。 + u8 buffer[ 12 ] = "SERIAL"; // 適当な文字列をMACアドレスと結合してSHA1を取り、仮SerialNoとする。 + u8 serialNo[ SVC_SHA1_DIGEST_SIZE ]; + int i; + int len = ( LCFG_THW_GetRegion() == OS_TWL_REGION_AMERICA ) ? + LCFG_TWL_HWINFO_SERIALNO_LEN_AMERICA : LCFG_TWL_HWINFO_SERIALNO_LEN_OTHERS; + OS_GetMacAddress( buffer + 6 ); + SVC_CalcSHA1( serialNo, buffer, sizeof(buffer) ); + for( i = 3; i < SVC_SHA1_DIGEST_SIZE; i++ ) { + serialNo[ i ] = (u8)( ( serialNo[ i ] % 10 ) + 0x30 ); + } + MI_CpuCopy8( "SRN", serialNo, 3 ); + MI_CpuClear8( &serialNo[ len ], sizeof(serialNo) - len ); +// OS_TPrintf( "serialNo : %s\n", serialNo ); + LCFG_THW_SetSerialNo( serialNo ); + }else { + LCFG_THW_SetSerialNo( pSerialNo ); + } + + // ランチャーTitleID_Loのセット + { + int i; + u8 titleID_Lo[4]; + for( i = 0; i < 4; i++ ) titleID_Lo[ i ] = (u8)strLauncherGameCode[ region ][ 4 - i - 1 ]; + LCFG_THW_SetLauncherTitleID_Lo( (const u8 *)titleID_Lo ); + } + + // ライト + if( isWrite && + !LCFGi_THW_WriteSecureInfo( s_pPrivKeyBuffer ) ) { + isWrite = FALSE; + OS_TPrintf( "HW Secure Info Write failed.\n" ); + } + + return isWrite; } @@ -421,23 +422,23 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi Description: HWID署名ファイルのライト - Arguments: + Arguments: Returns: None. *---------------------------------------------------------------------------*/ BOOL HWI_WriteHWIDSignFile( void ) { - BOOL retval; - - (void)FS_DeleteFile( (char *)LCFG_TWL_HWID_SIGN_PATH ); - if( !FS_CreateFile( LCFG_TWL_HWID_SIGN_PATH, FS_PERMIT_R | FS_PERMIT_W ) ) { - OS_TPrintf( "file create error. %s\n", LCFG_TWL_HWID_SIGN_PATH ); - } - retval = LCFG_WriteHWID_Signature( s_pPrivKeyBuffer ); - if( !retval ) { - OS_TPrintf( "HWID Signature Write failed.\n" ); - } - return retval; + BOOL retval; + + (void)FS_DeleteFile( (char *)LCFG_TWL_HWID_SIGN_PATH ); + if( !FS_CreateFile( LCFG_TWL_HWID_SIGN_PATH, FS_PERMIT_R | FS_PERMIT_W ) ) { + OS_TPrintf( "file create error. %s\n", LCFG_TWL_HWID_SIGN_PATH ); + } + retval = LCFG_WriteHWID_Signature( s_pPrivKeyBuffer ); + if( !retval ) { + OS_TPrintf( "HWID Signature Write failed.\n" ); + } + return retval; } /*---------------------------------------------------------------------------* @@ -451,16 +452,16 @@ BOOL HWI_WriteHWIDSignFile( void ) *---------------------------------------------------------------------------*/ BOOL HWI_DeleteHWNormalInfoFile( void ) { - if (FS_DeleteFile( (char *)LCFG_TWL_HWINFO_NORMAL_PATH )) - { - OS_TPrintf( "%s delete succeeded.\n", (char *)LCFG_TWL_HWINFO_NORMAL_PATH ); - return TRUE; - } - else - { - OS_TPrintf( "%s delete failed.\n", (char *)LCFG_TWL_HWINFO_NORMAL_PATH ); - return FALSE; - } + if (FS_DeleteFile( (char *)LCFG_TWL_HWINFO_NORMAL_PATH )) + { + OS_TPrintf( "%s delete succeeded.\n", (char *)LCFG_TWL_HWINFO_NORMAL_PATH ); + return TRUE; + } + else + { + OS_TPrintf( "%s delete failed.\n", (char *)LCFG_TWL_HWINFO_NORMAL_PATH ); + return FALSE; + } } /*---------------------------------------------------------------------------* @@ -474,16 +475,16 @@ BOOL HWI_DeleteHWNormalInfoFile( void ) *---------------------------------------------------------------------------*/ BOOL HWI_DeleteHWSecureInfoFile( void ) { - if (FS_DeleteFile( (char *)LCFG_TWL_HWINFO_SECURE_PATH )) - { - OS_TPrintf( "%s delete succeeded.\n", (char *)LCFG_TWL_HWINFO_SECURE_PATH ); - return TRUE; - } - else - { - OS_TPrintf( "%s delete failed.\n", (char *)LCFG_TWL_HWINFO_SECURE_PATH ); - return FALSE; - } + if (FS_DeleteFile( (char *)LCFG_TWL_HWINFO_SECURE_PATH )) + { + OS_TPrintf( "%s delete succeeded.\n", (char *)LCFG_TWL_HWINFO_SECURE_PATH ); + return TRUE; + } + else + { + OS_TPrintf( "%s delete failed.\n", (char *)LCFG_TWL_HWINFO_SECURE_PATH ); + return FALSE; + } } /*---------------------------------------------------------------------------* @@ -497,14 +498,14 @@ BOOL HWI_DeleteHWSecureInfoFile( void ) *---------------------------------------------------------------------------*/ BOOL HWI_DeleteHWIDSignFile( void ) { - if (FS_DeleteFile( (char *)LCFG_TWL_HWID_SIGN_PATH )) - { - OS_TPrintf( "%s delete succeeded.\n", (char *)LCFG_TWL_HWID_SIGN_PATH ); - return TRUE; - } - else - { - OS_TPrintf( "%s delete failed.\n", (char *)LCFG_TWL_HWID_SIGN_PATH ); - return FALSE; - } + if (FS_DeleteFile( (char *)LCFG_TWL_HWID_SIGN_PATH )) + { + OS_TPrintf( "%s delete succeeded.\n", (char *)LCFG_TWL_HWID_SIGN_PATH ); + return TRUE; + } + else + { + OS_TPrintf( "%s delete failed.\n", (char *)LCFG_TWL_HWID_SIGN_PATH ); + return FALSE; + } } diff --git a/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile b/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile index b91aee39..a73ffcb1 100644 --- a/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile @@ -88,6 +88,7 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \ libboc$(TWL_LIBSUFFIX).a \ libnam$(TWL_LIBSUFFIX).a \ libsea$(TWL_LIBSUFFIX).a \ + libacsign$(TWL_LIBSUFFIX).a \ libacsign_enc$(TWL_LIBSUFFIX).a \ libnamut$(TWL_LIBSUFFIX).a @@ -96,6 +97,8 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe +GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES)) + LDIRT_CLEAN = $(TARGET_TAD) #INSTALL_TARGETS = $(TARGET_TAD) #INSTALL_DIR = $(SDK_NMENU_DATADIR) diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile index d27778ce..710427e7 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile @@ -86,6 +86,7 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \ libboc$(TWL_LIBSUFFIX).a \ libnam$(TWL_LIBSUFFIX).a \ libsea$(TWL_LIBSUFFIX).a \ + libacsign$(TWL_LIBSUFFIX).a \ libacsign_enc$(TWL_LIBSUFFIX).a \ libnamut$(TWL_LIBSUFFIX).a @@ -94,6 +95,7 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe +GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES)) LDIRT_CLEAN = $(TARGET_TAD) #INSTALL_TARGETS = $(TARGET_TAD) diff --git a/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile index 743948c4..a17af386 100644 --- a/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile @@ -39,7 +39,7 @@ TWL_ARCHGEN = LIMITED TITLEID_LO = NINA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad -TARGET_BIN = NandFormatterAuto.srl +TARGET_BIN = NandInitializerAuto.srl LCFILE_SPEC = ../../NandInitializer/ARM9.TWL/ARM9-TS.lsf ROM_SPEC = ../../NandInitializer/ARM9.TWL/main.rsf @@ -93,6 +93,7 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \ libboc$(TWL_LIBSUFFIX).a \ libnam$(TWL_LIBSUFFIX).a \ libsea$(TWL_LIBSUFFIX).a \ + libacsign$(TWL_LIBSUFFIX).a \ libacsign_enc$(TWL_LIBSUFFIX).a \ libnamut$(TWL_LIBSUFFIX).a @@ -101,6 +102,8 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe +GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES)) + LDIRT_CLEAN = $(TARGET_TAD) #INSTALL_TARGETS = $(TARGET_TAD) #INSTALL_DIR = $(SDK_NMENU_DATADIR) diff --git a/include/sysmenu.h b/include/sysmenu.h index 55b998a5..4d0dd104 100644 --- a/include/sysmenu.h +++ b/include/sysmenu.h @@ -18,7 +18,7 @@ #define SYSMENU_H_ // Compile switch---------------------- -//#define DEBUG_USED_CARD_SLOT_B_ // デバッグ用でカードスロットBを使用する場合に有効にする。 +//#define DEBUG_USED_CARD_SLOT_B_ // デバッグ用でカードスロットBを使用する場合に有効にする。 //------------------------------------- @@ -32,7 +32,6 @@ #include #include #include -#include #include /* SYSMENU_H_ */