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

trunkのrev.2943とrev.2944の修正をマージ

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20100722_1_5@2945 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
(no author) 2010-07-26 08:33:21 +00:00
parent d086dd5c3c
commit 8cf3904473
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/libraries_sysmenu/dht/common/src/dht.c
View File

@ -369,7 +369,7 @@ static BOOL DHT_CheckDatabaseAdHoc(const DHTFileAdHoc* pDHT)
SVC_InitSignHeap(&pool, heap, sizeof(heap)); SVC_InitSignHeap(&pool, heap, sizeof(heap));
SVC_DecryptSign(&pool, md1, pDHT->header.sign, &g_pubkey_DER[29]); SVC_DecryptSign(&pool, md1, pDHT->header.sign, &g_pubkey_DER[29]);
// ƒnƒbƒVƒ…ŒvŽZ // ƒnƒbƒVƒ…ŒvŽZ
SVC_CalcSHA1(md2, DHT_GET_SIGN_TARGET_ADDR(&pDHT->header), DHT_GET_SIGN_TARGET_SIZE_EX(&pDHT->header)); SVC_CalcSHA1(md2, DHT_GET_SIGN_TARGET_ADDR(&pDHT->header), DHT_GET_SIGN_TARGET_SIZE_ADHOC(&pDHT->header));
// ŒŸ<C592>Ø // ŒŸ<C592>Ø
result = SVC_CompareSHA1(md1, md2); result = SVC_CompareSHA1(md1, md2);
if ( !result ) if ( !result )
@ -399,7 +399,7 @@ BOOL DHT_PrepareDatabaseAdHoc(DHTFileAdHoc* pDHT, FSFile* fp, s32 maxLength)
OS_TPrintf("Cannot read the DHT header (result=%d). [AdHoc]\n", result); OS_TPrintf("Cannot read the DHT header (result=%d). [AdHoc]\n", result);
return FALSE; return FALSE;
} }
// 拡張データベース読み込み // 個別対応データベース読み込み
PROFILE_COUNT(); PROFILE_COUNT();
length = (s32)DHT_GetDatabaseAdHocLength(pDHT); length = (s32)DHT_GetDatabaseAdHocLength(pDHT);
if ( length < sizeof(DHTHeader) ) if ( length < sizeof(DHTHeader) )
@ -407,7 +407,7 @@ BOOL DHT_PrepareDatabaseAdHoc(DHTFileAdHoc* pDHT, FSFile* fp, s32 maxLength)
OS_TPrintf("Invalid DHT header. [AdHoc]\n"); OS_TPrintf("Invalid DHT header. [AdHoc]\n");
return FALSE; return FALSE;
} }
if ( length < maxLength ) if ( length > maxLength )
{ {
OS_TPrintf("Too large size specified in the header.\n"); OS_TPrintf("Too large size specified in the header.\n");
return FALSE; return FALSE;
@ -426,7 +426,7 @@ BOOL DHT_PrepareDatabaseAdHoc(DHTFileAdHoc* pDHT, FSFile* fp, s32 maxLength)
PROFILE_COUNT(); PROFILE_COUNT();
} }
// 拡張データベースの検証 // 個別対応データベースの検証
PROFILE_COUNT(); PROFILE_COUNT();
result = DHT_CheckDatabaseAdHoc(pDHT); result = DHT_CheckDatabaseAdHoc(pDHT);
@ -443,7 +443,7 @@ BOOL DHT_PrepareDatabaseAdHoc(DHTFileAdHoc* pDHT, FSFile* fp, s32 maxLength)
} }
/* /*
ROMヘッダに対応する拡張データベースを手に入れる ROMヘッダに対応する個別対応データベースを手に入れる
*/ */
static const DHTDatabaseAdHoc* DHT_GetDatabaseAdHoc(const DHTFileAdHoc* pDHT, const ROM_Header_Short* pROMHeader) static const DHTDatabaseAdHoc* DHT_GetDatabaseAdHoc(const DHTFileAdHoc* pDHT, const ROM_Header_Short* pROMHeader)
{ {