DSハッシュテーブル検証コードのランチャーへの組み込み(DHT_TEST=TRUE指定でフルビルドすると組み込まれる)

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1127 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/libraries_sysmenu/hotsw/ARM7/Makefile

@@ -38,6 +38,11 @@ SRCS				=	blowfish.c \
 
 TARGET_LIB			=	libhotsw_sp$(TWL_LIBSUFFIX).a
 
+ifneq ($(DHT_TEST),)
+SRCDIR				+=  ../../../tests/CheckDSHashTable/src
+SRCS				+=  dht.c
+MACRO_FLAGS			+=  -DDHT_TEST
+endif
 
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 

build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c

@@ -162,6 +162,17 @@ static CardSecureModeFunction s_funcTable[] = {
     {ReadIDSecure_ROMEMU, ReadSegSecure_ROMEMU, SwitchONPNGSecure_ROMEMU, ChangeModeSecure_ROMEMU}
 };
 
+#ifdef DHT_TEST
+#include <sysmenu/dht/dht.h>
+DHTFile* dht;
+static void* ov_buffer = (void*)0x02e80000;
+static BOOL ReadImage(void* dest, s32 offset, s32 length, void* arg)
+{
+    HotSwState retval = ReadPageGame((CardBootData*)arg, (u32)offset, dest, (u32)length);
+    return (retval == HOTSW_SUCCESS);
+}
+#endif
+
 // Global Values ------------------------------------------------------------
 BLOWFISH_CTX                HotSwBlowfishInitTableBufDS;
 CardThreadData              HotSwThreadData;
@@ -405,6 +416,9 @@ static HotSwState LoadCardData(void)
                 s_cbData.twlFlg = TRUE;
             }
             else{
+#ifdef DHT_TEST
+                if ( !s_cbData.pBootSegBuf->rh.s.enable_signature )
+#endif
                 // NTRカードの場合はRomHeaderバッファの1ページ目以降をクリアしておく。
                 MI_CpuClearFast((void *)(SYSM_CARD_ROM_HEADER_BAK + PAGE_SIZE), SYSM_CARD_ROM_HEADER_SIZE - PAGE_SIZE);
             }
@@ -810,7 +824,6 @@ static HotSwState LoadStaticModule(void)
         return retval;
     }
 
-    
     // 拡張常駐モジュールの読み込み
     if( s_cbData.twlFlg ) {
         u32 size = ( s_cbData.pBootSegBuf->rh.s.main_ltd_size < SECURE_SEGMENT_SIZE ) ? s_cbData.pBootSegBuf->rh.s.main_ltd_size : SECURE_SEGMENT_SIZE;
@@ -877,6 +890,58 @@ static HotSwState LoadStaticModule(void)
         (void)CheckStaticModuleHash();
 #endif
     }
+#ifdef DHT_TEST
+    else
+    {
+        if ( !s_cbData.pBootSegBuf->rh.s.enable_signature )
+        {
+            SVCHMACSHA1Context ctx;
+            const DHTDatabase* db;
+
+            while (!dht)
+            {
+                OS_Sleep(1);
+            }
+
+            OS_TPrintf("Search DHT...");
+            db = DHT_GetDatabase(dht, &s_cbData.pBootSegBuf->rh.s);
+            if ( !db )
+            {
+                OS_TPrintf(" Failed.\n");
+                return HOTSW_HASH_CHECK_ERROR;
+            }
+            OS_TPrintf(" Done.\n");
+
+            OS_TPrintf("DHT Pahse1...");
+            DHT_CheckHashPhase1Init(&ctx, (ROM_Header_Short*)s_cbData.pBootSegBuf);
+            if( s_cbData.pBootSegBuf->rh.s.main_size > SECURE_SEGMENT_SIZE )
+            {
+                DHT_CheckHashPhase1Update(&ctx, s_cbData.pSecureSegBuf, SECURE_SEGMENT_SIZE);
+                DHT_CheckHashPhase1Update(&ctx, (u32 *)(s_cbData.arm9Stc + SECURE_SEGMENT_SIZE), s_cbData.pBootSegBuf->rh.s.main_size - SECURE_SEGMENT_SIZE );
+            }
+            else
+            {
+                DHT_CheckHashPhase1Update(&ctx, s_cbData.pSecureSegBuf, s_cbData.pBootSegBuf->rh.s.main_size);
+            }
+
+            DHT_CheckHashPhase1Update(&ctx, (u32 *)s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size);
+            if ( !DHT_CheckHashPhase1Final(&ctx, db) )
+            {
+                OS_TPrintf(" Failed.\n");
+                return HOTSW_HASH_CHECK_ERROR;
+            }
+            OS_TPrintf(" Done.\n");
+
+            OS_TPrintf("DHT Pahse2...");
+            if ( !DHT_CheckHashPhase2(db, &s_cbData.pBootSegBuf->rh.s, ov_buffer, ReadImage, &s_cbData) )
+            {
+                OS_TPrintf(" Failed.\n");
+                return HOTSW_HASH_CHECK_ERROR;
+            }
+            OS_TPrintf(" Done.\n");
+        }
+    }
+#endif
 
     return retval;
 }

build/libraries_sysmenu/sysmenu/ARM7/Makefile

@@ -32,6 +32,10 @@ SRCS				=	status.c \
 
 TARGET_LIB			=	libsysmenu_sp$(TWL_LIBSUFFIX).a
 
+ifneq ($(DHT_TEST),)
+MACRO_FLAGS			+=  -DDHT_TEST
+endif
+
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		=	$(TARGETS)

build/libraries_sysmenu/sysmenu/ARM9/Makefile

@@ -28,6 +28,7 @@ TWL_PROC	   	=	ARM9
 
 REVISION_SRC	=	src/revision.c
 
+SRCDIR		= src
 SRCS			=	sysmenu_lib.c \
 					util.c \
 					ninLogoFunc.c \
@@ -48,6 +49,12 @@ ifdef DO_NOT_SHOW_LAUNCHER
 MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
 endif
 
+ifneq ($(DHT_TEST),)
+SRCDIR				+=  ../../../tests/CheckDSHashTable/src
+SRCS				+=  dht.c
+MACRO_FLAGS			+=  -DDHT_TEST
+endif
+
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		=	$(TARGETS)

build/libraries_sysmenu/sysmenu/common/src/pxi.c

@@ -24,6 +24,16 @@
 #include <pm_pmic.h>
 #endif // SDK_ARM7
 
+#ifdef DHT_TEST
+#include <sysmenu/dht/dht.h>
+#ifdef SDK_ARM9
+#define DS_HASH_TABLE_SIZE  (128*1024)
+static u8 dht_buffer[DS_HASH_TABLE_SIZE] ATTRIBUTE_ALIGN(256);
+static DHTFile *const dht = (DHTFile*)dht_buffer;
+#else
+extern DHTFile* dht;
+#endif
+#endif
 
 // define data-----------------------------------------------------------------
 #define SYSM_PXI_COMM_STAT_REQ      0
@@ -90,6 +100,18 @@ void SYSM_InitPXI( u32 mcu_prio )
     SYSM_InitDecryptAESPXICallback();
 }
 
+#ifdef DHT_TEST
+#ifdef SDK_ARM9
+void SYSMi_PrepareDatabase(void)
+{
+    DHT_PrepareDatabase(dht);
+    DC_FlushRange(dht, DHT_GetDatabaseLength(dht));
+    OS_TPrintf("[ARM9] dht address: %08X\n", dht);
+    SYSMi_SendPXICommand( SYSM_PXI_COMM_DS_HASH_TABLE, (u16)(((u32)dht - 0x2000000) >> 8) );
+}
+#endif
+#endif
+
 // PXIコマンド送信
 BOOL SYSMi_TrySendPXICommand( SYSMPXICommand cmd, u16 data )
 {
@@ -163,6 +185,12 @@ void SYSMi_PXIFifoRecvCallback( PXIFifoTag tag, u32 data, BOOL err )
                 MCU_WriteRegister( MCU_REG_BL_ADDR, (u8)packet.data );
             }
             break;
+#ifdef DHT_TEST
+        case SYSM_PXI_COMM_DS_HASH_TABLE:
+            dht = (void*)(0x2000000 + (packet.data << 8));
+            OS_TPrintf("[ARM7] dht address: %08X\n", dht);
+            break;
+#endif
         default:
 #ifndef SDK_FINALROM
             OS_Panic( "illegal SYSM pxi command." );

build/systemMenu_RED/Launcher/ARM9/Makefile

@@ -92,6 +92,14 @@ ifdef DO_NOT_SHOW_LAUNCHER
 MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
 endif
 
+ifneq ($(DHT_TEST),)
+MACRO_FLAGS += -DDHT_TEST
+MAKEROM_FLAGS += -DDS_HASH_TABLE_FILE=DSHashTable.bin \
+			-DDS_HASH_TABLE_DIR=$(TWL_IPL_RED_PRIVATE_ROOT)/build/tools/MakeDSHashTable
+else
+MAKEROM_FLAGS += -DDS_HASH_TABLE_DIR=data
+endif
+
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 include	$(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot
 

build/systemMenu_RED/Launcher/ARM9/main.rsf

@@ -213,4 +213,7 @@ RomSpec
 	HostRoot	../../data
 	Root		/data
 	File		NTR_IPL_font_m.NFTR NoCardBanner.bnr EmptyBanner.bnr NoBanner.bnr fanfare.32.wav
+	HostRoot	$(DS_HASH_TABLE_DIR)
+	Root		/sign
+	File		$(DS_HASH_TABLE_FILE)
 }

build/systemMenu_RED/Launcher/ARM9/src/main.c

@@ -131,6 +131,10 @@ void TwlMain( void )
     // 各種パラメータの取得------------
     pBootTitle = SYSM_ReadParameters();                        // 本体設定データ、リセットパラメータのリード、検査用オート起動カード判定、量産ライン用キーショートカット起動判定等のリード
 
+#ifdef DHT_TEST
+    SYSMi_PrepareDatabase();
+#endif
+
     if( SYSM_IsFatalError() ) {
         // FATALエラー処理
     }
@@ -323,7 +327,7 @@ void TwlMain( void )
             SYSM_GoSleepMode();
     }
 #endif // DISABLE_SLEEP
-    }
+}
 }
 
 

build/tests/CheckDSHashTable/src/dht.c

@@ -52,6 +52,9 @@ static const u8 g_pubkey_DER[ 0xa2 ] = {
 
 static const u8 hmac_key[] = DHT_HMAC_KEY;
 
+static  DHTReadFunc ReadFunc;
+static  void*       readArg;
+#define PAGE_SIZE   512
 
 /*
     自家製bsearch
@@ -102,15 +105,45 @@ static int CompareGameCodeAndVersion(const void* a, const void* b)
 /*
 データベースを読み込む (前準備)
 */
+u32 DHT_GetDatabaseLength(const DHTFile* pDHT)
+{
+    if ( pDHT->header.magic_code != DHT_MAGIC_CODE )    // magic codeチェック
+    {
+        OS_TPrintf("Invalid " HASH_PATH " magic code (magic=0x%08X).\n", pDHT->header.magic_code);
+        return 0;
+    }
+    return sizeof(DHTHeader) + pDHT->header.nums * sizeof(DHTDatabase);
+}
+BOOL DHT_CheckDatabase(const DHTFile* pDHT)
+{
+    SVCSignHeapContext pool;
+    u8 heap[4*1024];
+    u8 md1[20];
+    u8 md2[20];
+    s32 result;
+    // ファイル署名取り出し
+    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(&pDHT->header));
+    // 検証
+    result = SVC_CompareSHA1(md1, md2);
+    if ( !result )
+    {
+        OS_TPrintf("\n");
+        OS_TPrintfEx("SIGN = % 20B\n", md1);
+        OS_TPrintfEx("HASH = % 20B\n", md2);
+        OS_TPrintf("Signature is not valid.\n");
+        return FALSE;
+    }
+    return TRUE;
+}
+
 BOOL DHT_PrepareDatabase(DHTFile* pDHT)
 {
     FSFile file;
     u32 length;
     s32 result;
-    SVCSignHeapContext pool;
-    u8 heap[4*1024];
-    u8 md1[20];
-    u8 md2[20];
     PROFILE_INIT();
 
     // ファイルオープン
@@ -128,21 +161,16 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT)
         OS_TPrintf("Cannot read the header of " HASH_PATH " (result=%d).\n", result);
         return FALSE;
     }
-    if ( pDHT->header.magic_code != DHT_MAGIC_CODE )
-    {
-        OS_TPrintf("Invalid " HASH_PATH " magic code (magic=0x%08X).\n", pDHT->header.magic_code);
-        return FALSE;
-    }
     // サイズチェック
     PROFILE_COUNT();
     length = FS_GetFileLength(&file);
-    if ( length != sizeof(DHTHeader) + pDHT->header.nums * sizeof(DHTDatabase) )
+    if ( length != DHT_GetDatabaseLength(pDHT) )
     {
-        OS_TPrintf("Invalid " HASH_PATH " size (%d != %d).\n", length, sizeof(DHTHeader) + pDHT->header.nums * sizeof(DHTDatabase));
+        OS_TPrintf("Invalid " HASH_PATH " size (%d != %d).\n", length, DHT_GetDatabaseLength(pDHT));
         return FALSE;
     }
     // databaseサイズの保存
-    length = pDHT->header.nums * sizeof(DHTDatabase);
+    length -= sizeof(DHTHeader);
     // データベース読み込み
     PROFILE_COUNT();
     result = FS_ReadFile(&file, pDHT->database, (s32)length);
@@ -152,23 +180,11 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT)
         return FALSE;
     }
     FS_CloseFile(&file);
-    // ファイル署名取り出し
+
+    // データベースの検証
     PROFILE_COUNT();
-    SVC_InitSignHeap(&pool, heap, sizeof(heap));
+    result = DHT_CheckDatabase(pDHT);
-    SVC_DecryptSign(&pool, md1, pDHT->header.sign, &g_pubkey_DER[29]);
+
-    // ハッシュ計算
-    PROFILE_COUNT();
-    SVC_CalcSHA1(md2, DHT_GET_SIGN_TARGET_ADDR(&pDHT->header), DHT_GET_SIGN_TARGET_SIZE(&pDHT->header));
-    // 検証
-    PROFILE_COUNT();
-    result = SVC_CompareSHA1(md1, md2);
-    if ( !result )
-    {
-        OS_TPrintfEx("SIGN = % 20B\n", md1);
-        OS_TPrintfEx("HASH = % 20B\n", md2);
-        OS_TPrintf("Signature is not valid.\n");
-        return FALSE;
-    }
     // 結果報告
 #ifdef PRINT_PROFILE
     PROFILE_COUNT();
@@ -177,12 +193,10 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT)
     OS_TPrintf("%10d msec for reading header.\n",   (int)OS_TicksToMilliSeconds(profile[2]-profile[1]));
     OS_TPrintf("%10d msec for size check.\n",       (int)OS_TicksToMilliSeconds(profile[3]-profile[2]));
     OS_TPrintf("%10d msec for reading database.\n", (int)OS_TicksToMilliSeconds(profile[4]-profile[3]));
-    OS_TPrintf("%10d msec for decrypt sign.\n",     (int)OS_TicksToMilliSeconds(profile[5]-profile[4]));
+    OS_TPrintf("%10d msec for comparing hash.\n",   (int)OS_TicksToMilliSeconds(profile[5]-profile[4]));
-    OS_TPrintf("%10d msec for hashing database.\n", (int)OS_TicksToMilliSeconds(profile[6]-profile[5]));
+    OS_TPrintf("\nTotal: %10d msec.\n",             (int)OS_TicksToMilliSeconds(profile[5]-profile[0]));
-    OS_TPrintf("%10d msec for comparing hash.\n",   (int)OS_TicksToMilliSeconds(profile[7]-profile[6]));
-    OS_TPrintf("\nTotal: %10d msec.\n",             (int)OS_TicksToMilliSeconds(profile[7]-profile[0]));
 #endif
-    return TRUE;
+    return result;
 }
 /*
 ROMヘッダに対応するデータベースを手に入れる
@@ -212,85 +226,73 @@ const DHTDatabase* DHT_GetDatabase(const DHTFile* pDHT, const ROM_Header_Short*
 ハッシュ計算 (1)
 読み込み済みデータをチェックする
 */
-BOOL DHT_CheckHashPhase1(const DHTDatabase *db, const ROM_Header_Short* pROMHeader, const void* pARM9, const void* pARM7)
+void DHT_CheckHashPhase1Init(SVCHMACSHA1Context* ctx, const ROM_Header_Short* pROMHeader)
+{
+    // 準備
+    SVC_HMACSHA1Init(ctx, hmac_key, sizeof(hmac_key));
+    // ヘッダ
+    SVC_HMACSHA1Update(ctx, pROMHeader, DHT_DS_HEADER_SIZE);
+}
+void DHT_CheckHashPhase1Update(SVCHMACSHA1Context* ctx, const void* ptr, u32 length)
+{
+    // ARM9 or ARM7 static
+    SVC_HMACSHA1Update(ctx, ptr, length);
+}
+BOOL DHT_CheckHashPhase1Final(SVCHMACSHA1Context* ctx, const DHTDatabase *db)
 {
-    SVCHMACSHA1Context ctx;
     u8 md[20];
     BOOL result;
-    PROFILE_INIT();
+    SVC_HMACSHA1GetHash(ctx, md);
-
-    // 準備
-    PROFILE_COUNT();
-    SVC_HMACSHA1Init(&ctx, hmac_key, sizeof(hmac_key));
-    // ヘッダ
-    PROFILE_COUNT();
-    SVC_HMACSHA1Update(&ctx, pROMHeader, DHT_DS_HEADER_SIZE);
-    // ARM9 Static
-    PROFILE_COUNT();
-    SVC_HMACSHA1Update(&ctx, pARM9, pROMHeader->main_size);
-    // ARM7 Static
-    PROFILE_COUNT();
-    SVC_HMACSHA1Update(&ctx, pARM7, pROMHeader->sub_size);
-    // 検証
-    PROFILE_COUNT();
-    SVC_HMACSHA1GetHash(&ctx, md);
     result = SVC_CompareSHA1(db->hash[0], md);
     if ( !result )
     {
+        OS_TPrintf("\n");
         OS_TPrintfEx("DB   = % 20B\n", db->hash[0]);
         OS_TPrintfEx("HASH = % 20B\n", md);
         OS_TPrintf("%s: hash[0] is not valid.\n", __func__);
     }
+    return result;
+}
+BOOL DHT_CheckHashPhase1(const DHTDatabase *db, const ROM_Header_Short* pROMHeader, const void* pARM9, const void* pARM7)
+{
+    SVCHMACSHA1Context ctx;
+    BOOL result;
+    PROFILE_INIT();
+
+    // 準備＆ヘッダ
+    PROFILE_COUNT();
+    DHT_CheckHashPhase1Init(&ctx, pROMHeader);
+
+    // ARM9 Static
+    PROFILE_COUNT();
+    DHT_CheckHashPhase1Update(&ctx, pARM9, pROMHeader->main_size);
+    // ARM7 Static
+    PROFILE_COUNT();
+    DHT_CheckHashPhase1Update(&ctx, pARM7, pROMHeader->sub_size);
+    // 検証
+    PROFILE_COUNT();
+    result = DHT_CheckHashPhase1Final(&ctx, db);
     // 結果報告
 #ifdef PRINT_PROFILE
     PROFILE_COUNT();
     OS_TPrintf("\nDone to check the hash (phase 1).\n");
-    OS_TPrintf("%10d msec for preparing hash.\n",   (int)OS_TicksToMilliSeconds(profile[1]-profile[0]));
+    OS_TPrintf("%10d msec for scanning header.\n",  (int)OS_TicksToMilliSeconds(profile[1]-profile[0]));
-    OS_TPrintf("%10d msec for scanning header.\n",  (int)OS_TicksToMilliSeconds(profile[2]-profile[1]));
+    OS_TPrintf("%10d msec for scanning ARM9.\n",    (int)OS_TicksToMilliSeconds(profile[2]-profile[1]));
-    OS_TPrintf("%10d msec for scanning ARM9.\n",    (int)OS_TicksToMilliSeconds(profile[3]-profile[2]));
+    OS_TPrintf("%10d msec for scanning ARM7.\n",    (int)OS_TicksToMilliSeconds(profile[3]-profile[2]));
-    OS_TPrintf("%10d msec for scanning ARM7.\n",    (int)OS_TicksToMilliSeconds(profile[4]-profile[3]));
+    OS_TPrintf("%10d msec for comparing hash.\n",   (int)OS_TicksToMilliSeconds(profile[4]-profile[3]));
-    OS_TPrintf("%10d msec for comparing hash.\n",   (int)OS_TicksToMilliSeconds(profile[5]-profile[4]));
+    OS_TPrintf("\nTotal: %10d msec.\n",     (int)OS_TicksToMilliSeconds(profile[4]-profile[0]));
-    OS_TPrintf("\nTotal: %10d msec.\n",     (int)OS_TicksToMilliSeconds(profile[5]-profile[0]));
 #endif
     return result;
 }
+
 /*
 ハッシュ計算 (2)
 対象領域の読み込みとチェックを行う
 FSを用いたテストの場合とCARDアプリの場合で異なる
 */
-#if 1
+static BOOL ImageHMACSHA1Update(SVCHMACSHA1Context* ctx, s32 offset, s32 length, void* buffer)
-// FS版 (fctx == FSFile*)
-static BOOL ReadImage(void* fctx, void* dest, s32 offset, s32 length)
 {
-    FSFile* fp = fctx;
+    if ( !ReadFunc(buffer, offset, length, readArg) )
-    s32 result;
-    if ( !FS_SeekFile(fp, offset, FS_SEEK_SET) )
-    {
-        OS_TPrintf("Cannot seek to the offset (%d bytes).\n", offset);
-        return FALSE;
-    }
-    result = FS_ReadFile(fp, dest, length);
-    if ( result != length )
-    {
-        OS_TPrintf("Cannot read the data (%d bytes).\n", length);
-        return FALSE;
-    }
-    return TRUE;
-}
-#else
-// CARD版 (fctx == dma no)
-static BOOL ReadImage(void* fctx, void* dest, s32 offset, s32 length)
-{
-    u32 dma = (u32)fctx;
-    CARD_ReadRom(dma, (void*)offset, dest, (u32)length);
-    return TRUE;
-}
-#endif
-
-static BOOL ImageHMACSHA1Update(SVCHMACSHA1Context* ctx, void* fctx, s32 offset, s32 length, void* buffer)
-{
-    if ( !ReadImage(fctx, buffer, offset, length) )
     {
         return FALSE;
     }
@@ -298,25 +300,33 @@ static BOOL ImageHMACSHA1Update(SVCHMACSHA1Context* ctx, void* fctx, s32 offset,
     return TRUE;
 }
 
-static BOOL GetOverlayInfo(int no, void* fctx, int fat_offset, int* pOffset, int* pLength)
+static BOOL GetOverlayInfo(int no, int fat_offset, int* pOffset, int* pLength)
 {
-    ROM_FAT fat;
+    ROM_FAT *fat;
-    if ( !ReadImage(fctx, &fat, fat_offset + no * (s32)sizeof(ROM_FAT), sizeof(ROM_FAT)) )
+    static u8 fat_cache[PAGE_SIZE];
+    static int last_page = 0;
+    int page = (fat_offset + no * (s32)sizeof(ROM_FAT)) / PAGE_SIZE;
+    if ( last_page != page )
+    {
+        if ( !ReadFunc(&fat_cache, page * PAGE_SIZE, PAGE_SIZE, readArg) )
         {
             return FALSE;
         }
+        last_page = page;
+    }
+    fat = (ROM_FAT*)(fat_cache + fat_offset + no * sizeof(ROM_FAT) - page * PAGE_SIZE);
     if ( pOffset )
     {
-        *pOffset = (s32)fat.top.offset;
+        *pOffset = (s32)fat->top.offset;
     }
     if ( pLength )
     {
-        *pLength = (s32)(fat.bottom.offset - fat.top.offset);
+        *pLength = (s32)(fat->bottom.offset - fat->top.offset);
     }
     return TRUE;
 }
 
-BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHeader, void* fctx, void* buffer)
+BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHeader, void* buffer, DHTReadFunc func, void* arg)
 {
     int overlay_nums = (int)(pROMHeader->main_ovt_size / sizeof(ROM_OVT));
     u8 md[20];
@@ -328,19 +338,26 @@ BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHead
         int total_sectors;
         int i;
 
+        if ( !func )
+        {
+            return FALSE;
+        }
+        ReadFunc = func;
+        readArg   = arg;
+
         // 準備
         PROFILE_COUNT();
         SVC_HMACSHA1Init(&ctx, hmac_key, sizeof(hmac_key));
         // OVT
         PROFILE_COUNT();
-        if ( !ImageHMACSHA1Update(&ctx, fctx, (s32)pROMHeader->main_ovt_offset, (s32)pROMHeader->main_ovt_size, buffer) )
+        if ( !ImageHMACSHA1Update(&ctx, (s32)pROMHeader->main_ovt_offset, (s32)pROMHeader->main_ovt_size, buffer) )
         {
             OS_TPrintf("Cannot calc HMAC-SHA1 for OVT.\n");
             return FALSE;
         }
         // FAT
         PROFILE_COUNT();
-        if ( !ImageHMACSHA1Update(&ctx, fctx, (s32)pROMHeader->fat_offset, overlay_nums * (s32)sizeof(ROM_FAT), buffer) )
+        if ( !ImageHMACSHA1Update(&ctx, (s32)pROMHeader->fat_offset, overlay_nums * (s32)sizeof(ROM_FAT), buffer) )
         {
             OS_TPrintf("Cannot calc HMAC-SHA1 for %d of FAT.\n", overlay_nums);
             return FALSE;
@@ -353,7 +370,7 @@ BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHead
             int max_sectors = (DHT_OVERLAY_MAX/512 - total_sectors) / (overlay_nums - i);
             int offset;
             int length;
-            if ( !GetOverlayInfo(i, fctx, (s32)pROMHeader->fat_offset, &offset, &length) )
+            if ( !GetOverlayInfo(i, (s32)pROMHeader->fat_offset, &offset, &length) )
             {
                 OS_TPrintf("Cannot get %d of overlay info.\n", i);
                 return FALSE;
@@ -363,7 +380,7 @@ BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHead
             {
                 length = max_sectors;
             }
-            if ( !ImageHMACSHA1Update(&ctx, fctx, offset, length * 512, buffer) )
+            if ( !ImageHMACSHA1Update(&ctx, offset, length * 512, buffer) )
             {
                 OS_TPrintf("Cannot calc HMAC-SHA1 for %d of overlay.\n", i);
                 return FALSE;
@@ -385,6 +402,7 @@ BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHead
     }
     if ( !SVC_CompareSHA1(md, db->hash[1]) )
     {
+        OS_TPrintf("\n");
         OS_TPrintfEx("DB   = % 20B\n", db->hash[1]);
         OS_TPrintfEx("HASH = % 20B\n", md);
         OS_TPrintf("%s: hash[1] is not valid.\n", __func__);

build/tests/CheckDSHashTable/src/main.c

@@ -47,6 +47,49 @@ static u8 rom_arm9[3*1024*1024] ATTRIBUTE_ALIGN(32);
 static u8 rom_arm7[1024*1024] ATTRIBUTE_ALIGN(32);
 #include <twl/ltdmain_end.h>
 
+/*
+    デバイスアクセスAPI
+*/
+#if 0
+// FS版 (fctx == FSFile*)
+static BOOL ReadImage(void* dest, s32 offset, s32 length, void* arg)
+{
+    FSFile* fp = arg;
+    s32 result;
+    if ( !FS_SeekFile(fp, offset, FS_SEEK_SET) )
+    {
+        OS_TPrintf("Cannot seek to the offset (%d bytes).\n", offset);
+        return FALSE;
+    }
+    result = FS_ReadFile(fp, dest, length);
+    if ( result != length )
+    {
+        OS_TPrintf("Cannot read the data (%d bytes).\n", length);
+        return FALSE;
+    }
+    return TRUE;
+}
+#else
+#ifdef SDK_ARM9
+#define PAGE_SIZE 512
+// CARD版 (fctx == dma no)
+static BOOL ReadImage(void* dest, s32 offset, s32 length, void* arg)
+{
+    u32 dma = (u32)arg;
+    CARD_ReadRom(dma, (void*)offset, dest, (u32)length);
+    return TRUE;
+}
+#else
+// HOTSW版 (fctx == CardBootData* cdb)
+#include    <hotswTypes.h>
+#include    <dsCardCommon.h>
+static BOOL ReadImage(void* dest, s32 offset, s32 length, void* arg)
+{
+    HotSwState retval = ReadPageGame((CardBootData*)arg, (u32)offset, dest, (u32)length);
+    return (retval == HOTSW_SUCCESS);
+}
+#endif
+#endif
 
 static void VBlankIntr( void )
 {
@@ -116,7 +159,7 @@ static BOOL CheckValidation(FSFile* fp)
         return FALSE;
     }
     // ハッシュ計算 (2) - 隠蔽は難しいか
-    if ( !DHT_CheckHashPhase2(db, &rom_header, fp, ov_buffer) )
+    if ( !DHT_CheckHashPhase2(db, &rom_header, ov_buffer, ReadImage, fp) )
     {
         return FALSE;
     }

include/sysmenu/dht/dht.h

@@ -25,10 +25,35 @@
 extern "C" {
 #endif
 
+typedef BOOL    (*DHTReadFunc)(void* dest, s32 offset, s32 length, void* arg);
+
 /*---------------------------------------------------------------------------*
   Name:         DHT_PrepareDatabase
 
-  Description:  全データベースを読み込む
+  Description:  読み込み済みのデータベースのヘッダからサイズを返す
+
+  Arguments:    pDHT        データベースヘッダの格納先
+
+  Returns:      正しそうなヘッダならサイズ、そうでないなら0
+ *---------------------------------------------------------------------------*/
+u32 DHT_GetDatabaseLength(const DHTFile* pDHT);
+
+/*---------------------------------------------------------------------------*
+  Name:         DHT_PrepareDatabase
+
+  Description:  読み込み済みの全データベースの署名を検証する
+
+  Arguments:    pDHT        データベースの格納先
+
+  Returns:      成功すればTRUE
+ *---------------------------------------------------------------------------*/
+BOOL DHT_CheckDatabase(const DHTFile* pDHT);
+
+/*---------------------------------------------------------------------------*
+  Name:         DHT_PrepareDatabase
+
+  Description:  FS関数を利用して全データベースを読み込み検証まで行う
+                ファイル名は/sign/DSHashTable.bin固定
 
   Arguments:    pDHT        全データベースの格納先
 
@@ -48,6 +73,45 @@ BOOL DHT_PrepareDatabase(DHTFile* pDHT);
  *---------------------------------------------------------------------------*/
 const DHTDatabase* DHT_GetDatabase(const DHTFile* pDHT, const ROM_Header_Short* pROMHeader);
 
+/*---------------------------------------------------------------------------*
+  Name:         DHT_CheckHashPhase1Init
+
+  Description:  ROMヘッダおよびARM9/ARM7スタティック領域の検証の準備
+
+  Arguments:    ctx         検証用のSVCHMACSHA1コンテキスト
+                pROMHeader  対象となるROMヘッダ格納先
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void DHT_CheckHashPhase1Init(SVCHMACSHA1Context* ctx, const ROM_Header_Short* pROMHeader);
+
+/*---------------------------------------------------------------------------*
+  Name:         DHT_CheckHashPhase1Update
+
+  Description:  ROMヘッダおよびARM9/ARM7スタティック領域の検証のスタティック部分
+                いくら分割しても良いが、ARM9スタティック、ARM7スタティックの順に
+                呼び出すこと。
+
+  Arguments:    ctx         検証用のSVCHMACSHA1コンテキスト
+                ptr         対象となるデータ領域
+                length      対象となるデータサイズ
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void DHT_CheckHashPhase1Update(SVCHMACSHA1Context* ctx, const void* ptr, u32 length);
+
+/*---------------------------------------------------------------------------*
+  Name:         DHT_CheckHashPhase1
+
+  Description:  ROMヘッダおよびARM9/ARM7スタティック領域の検証の結果判定
+
+  Arguments:    ctx         検証用のSVCHMACSHA1コンテキスト
+                db          対象データベースへのポインタ
+
+  Returns:      問題なければTRUE
+ *---------------------------------------------------------------------------*/
+BOOL DHT_CheckHashPhase1Final(SVCHMACSHA1Context* ctx, const DHTDatabase *db);
+
 /*---------------------------------------------------------------------------*
   Name:         DHT_CheckHashPhase1
 
@@ -65,17 +129,19 @@ BOOL DHT_CheckHashPhase1(const DHTDatabase *db, const ROM_Header_Short* pROMHead
 /*---------------------------------------------------------------------------*
   Name:         DHT_CheckHashPhase2
 
-  Description:  オー馬齢領域の検証
+  Description:  オーバーレイ領域の検証
+                (デバイスのRead APIを登録できるべき)
 
   Arguments:    db          対象データベースへのポインタ
                 pROMHeader  対象となるROMヘッダ格納先
                 fctx        (FS版) FSFile構造体へのポインタ
                             (CARD版) dma番号をvoid*にキャストしたもの
+                            (HOTSW版) CardBootData構造体へのポインタ
                 buffer      本APIで使用するワーク (DHT_OVERLAY_MAXだけ必要)
 
   Returns:      問題なければTRUE
  *---------------------------------------------------------------------------*/
-BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHeader, void* fctx, void* buffer);
+BOOL DHT_CheckHashPhase2(const DHTDatabase *db, const ROM_Header_Short* pROMHeader, void* buffer, DHTReadFunc func, void* arg);
 
 #ifdef __cplusplus
 } /* extern "C" */

include/sysmenu/sysmenu_lib/common/pxi.h

@@ -27,14 +27,18 @@ extern "C" {
 //----------------------------------------------------------------------
 //　PXIコマンド
 //----------------------------------------------------------------------
-#define SYSMENU_PXI_FIFO_TAG				(PXI_MAX_FIFO_TAG - 1)
+                                        //  (PXI_MAX_FIFO_TAG - 1) is used by SEA
 #define PXI_FIFO_TAG_MCUTEST                (PXI_MAX_FIFO_TAG - 2)
 #define PXI_FIFO_TAG_HOTSW                  (PXI_MAX_FIFO_TAG - 3)
 #define PXI_FIFO_TAG_DECRYPTAES             (PXI_MAX_FIFO_TAG - 4)
+#define SYSMENU_PXI_FIFO_TAG                (PXI_MAX_FIFO_TAG - 5)
 
 typedef enum SYSMPXICommand {
     SYSM_PXI_COMM_BL_BRIGHT = 0,
     SYSM_PXI_COMM_DISABLE_HOTSW = 1,
+#ifdef DHT_TEST
+    SYSM_PXI_COMM_DS_HASH_TABLE = 2,
+#endif
 
     SYSM_PXI_COMM_NUM
 }SYSMPXICommand;
@@ -50,6 +54,12 @@ void SYSM_InitPXI( void );
 void SYSM_InitPXI( u32 mcu_prio );
 #endif // SDK_ARM7
 
+#ifdef DHT_TEST
+#ifdef SDK_ARM9
+void SYSMi_PrepareDatabase(void);
+#endif
+#endif
+
 // PXIコマンド送信
 BOOL SYSMi_TrySendPXICommand( SYSMPXICommand cmd, u16 data );
 BOOL SYSMi_SendPXICommand( SYSMPXICommand command, u16 data );