From 8cf3904473a29e81207114be1413a7b05a45f9c5 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff> Date: Mon, 26 Jul 2010 08:33:21 +0000 Subject: [PATCH] =?UTF-8?q?trunk=E3=81=AErev.2943=E3=81=A8rev.2944?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E3=83=9E=E3=83=BC=E3=82=B8?= 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/branches/20100722_1_5@2945 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/dht/common/src/dht.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/libraries_sysmenu/dht/common/src/dht.c b/build/libraries_sysmenu/dht/common/src/dht.c index 9affd8db..68f2a3ff 100644 --- a/build/libraries_sysmenu/dht/common/src/dht.c +++ b/build/libraries_sysmenu/dht/common/src/dht.c @@ -369,7 +369,7 @@ static BOOL DHT_CheckDatabaseAdHoc(const DHTFileAdHoc* pDHT) SVC_InitSignHeap(&pool, heap, sizeof(heap)); SVC_DecryptSign(&pool, md1, pDHT->header.sign, &g_pubkey_DER[29]); // ハッシュ計算 - 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)); // 検証 result = SVC_CompareSHA1(md1, md2); 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); return FALSE; } - // 拡張データベース読み込み + // 個別対応データベース読み込み PROFILE_COUNT(); length = (s32)DHT_GetDatabaseAdHocLength(pDHT); if ( length < sizeof(DHTHeader) ) @@ -407,7 +407,7 @@ BOOL DHT_PrepareDatabaseAdHoc(DHTFileAdHoc* pDHT, FSFile* fp, s32 maxLength) OS_TPrintf("Invalid DHT header. [AdHoc]\n"); return FALSE; } - if ( length < maxLength ) + if ( length > maxLength ) { OS_TPrintf("Too large size specified in the header.\n"); return FALSE; @@ -426,7 +426,7 @@ BOOL DHT_PrepareDatabaseAdHoc(DHTFileAdHoc* pDHT, FSFile* fp, s32 maxLength) PROFILE_COUNT(); } - // 拡張データベースの検証 + // 個別対応データベースの検証 PROFILE_COUNT(); 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) {