From 64a4d850c01d5a4a2d1118f7fcbb6b9de83008e5 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 5 Mar 2008 10:18:52 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20?=
 =?UTF-8?q?=E3=83=BBblowfish=E3=81=AE=E3=82=BD=E3=83=BC=E3=82=B9=E3=82=92?=
 =?UTF-8?q?=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@828 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../hotsw/ARM7/include/blowfish.h             |  2 +-
 .../hotsw/ARM7/src/blowfish.c                 | 37 ++++++++++---------
 .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c  |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h b/build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h
index 1e0b64ae..559cf008 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/blowfish.h
@@ -40,7 +40,7 @@ void EncryptByBlowfish(const BLOWFISH_CTX *ctx, u32 *xl, u32 *xr);
 void DecryptByBlowfish(const BLOWFISH_CTX *ctx, u32 *xl, u32 *xr);
 
 // Key Table の生成
-void GCDm_MakeBlowfishTableDS(BLOWFISH_CTX *tableBufp, ROM_Header_Short *rhs, u32 *keyBufp, s32 keyLen);
+void GCDm_MakeBlowfishTableDS(CardBootData *cbd, s32 keyLen);
 
 
 #ifdef __cplusplus
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c b/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c
index 6f71e741..116b4d5c 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/blowfish.c
@@ -25,27 +25,30 @@ static u32 F(const BLOWFISH_CTX *ctx, u32 x);
 // 	GCDm_MakeBlowfishTableDS関数
 //
 //*****************************************
-void GCDm_MakeBlowfishTableDS(BLOWFISH_CTX *tableBufp, ROM_Header_Short *rhs, u32 *keyBufp, s32 keyLen)
+void GCDm_MakeBlowfishTableDS(CardBootData *cbd, s32 keyLen)
 {
-  const BLOWFISH_CTX *blowfishInitTablep = &GCDi_BlowfishInitTableDS;
-  u32 blowfishedKey[2];
+	const BLOWFISH_CTX *blowfishInitTablep = &GCDi_BlowfishInitTableDS;
+	u32 blowfishedKey[2];
 
-  MI_CpuCopy32((void *)blowfishInitTablep, (void *)tableBufp, sizeof(BLOWFISH_CTX));
-
-  keyBufp[0] = *(u32 *)rhs->game_code;
-  keyBufp[1] = *(u32 *)rhs->game_code >> 1;
-  keyBufp[2] = *(u32 *)rhs->game_code << 1;
-
-  InitBlowfishKeyAndTableDS(tableBufp, keyBufp, keyLen);
-
-  blowfishedKey[0] = (u32)rhs->ctrl_reserved_B[0];
-  blowfishedKey[1] = *(u32 *)&rhs->ctrl_reserved_B[4];
-
-//  OS_TPrintf("Blowfish - key[0]:%d  key[1]:%d\n",blowfishedKey[0],blowfishedKey[1]);
+    u8 			 *RomHeaderCtrlRsvB = cbd->pBootSegBuf->rh.s.ctrl_reserved_B;
+    u32 		 *RomHeaderGameCode = (u32 *)cbd->pBootSegBuf->rh.s.game_code;
+	u32			 *keyBuf			= cbd->keyBuf;
+    BLOWFISH_CTX *ctx				= &cbd->keyTable;
     
-  DecryptByBlowfish(tableBufp, &(blowfishedKey)[1], &(blowfishedKey)[0]);
+	MI_CpuCopy32((void *)blowfishInitTablep, (void *)ctx, sizeof(BLOWFISH_CTX));
 
-  InitBlowfishKeyAndTableDS(tableBufp, keyBufp, keyLen);
+  	keyBuf[0] = *RomHeaderGameCode;
+  	keyBuf[1] = *RomHeaderGameCode >> 1;
+  	keyBuf[2] = *RomHeaderGameCode << 1;
+
+  	InitBlowfishKeyAndTableDS(ctx, keyBuf, keyLen);
+
+  	blowfishedKey[0] = (u32)RomHeaderCtrlRsvB[0];
+  	blowfishedKey[1] = *(u32 *)&RomHeaderCtrlRsvB[4];
+    
+  	DecryptByBlowfish(ctx, &(blowfishedKey)[1], &(blowfishedKey)[0]);
+
+  	InitBlowfishKeyAndTableDS(ctx, keyBuf, keyLen);
 }
 
 //*****************************************
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 70197f35..baa47800 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -380,7 +380,7 @@ static HotSwState LoadCardData(void)
 			s_cbData.secureLatency = AddLatency2ToLatency1(s_cbData.pBootSegBuf->rh.s.secure_cmd_param);
 
 	    	// Key Table初期化
-	    	GCDm_MakeBlowfishTableDS(&s_cbData.keyTable, &s_pBootSegBuffer->rh.s, s_cbData.keyBuf, 8);
+	    	GCDm_MakeBlowfishTableDS(&s_cbData, 8);
 
 			// コマンド認証値・コマンドカウンタ初期値・PNジェネレータ初期値の生成
             GenVA_VB_VD();