From 812e34898b9c2c21377b7361b3db3d7222244ca9 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 23 Apr 2008 02:49:59 +0000
Subject: [PATCH] =?UTF-8?q?=E7=84=A1=E7=B7=9A=E3=83=95=E3=82=A1=E3=83=BC?=
 =?UTF-8?q?=E3=83=A0=E3=81=AE=E7=BD=B2=E5=90=8D=E3=83=81=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=82=92=E7=84=A1=E8=A6=96=E3=81=99=E3=82=8B=E3=83=93?=
 =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81IGNORE=5F?=
 =?UTF-8?q?WLFIRM=5FSIGN=5FCHECK=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
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@1231 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/Makefile      | 13 +++++++++----
 .../Launcher/ARM9/src/loadWlanFirm.c             | 16 ++++------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index ae81d60c..e605d2b1 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -32,10 +32,11 @@ SUBDIRS					=	\
 ifneq ($(UPDATER_RELEASE),TRUE)
 
 # COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。
-export DO_NOT_SHOW_LAUNCHER	=	FALSE
-export DISABLE_WDS_SCAN		=	TRUE
-export DISABLE_WLFIRM_LOAD	=	TRUE
-export DISABLE_SLEEP		=	TRUE
+export DO_NOT_SHOW_LAUNCHER		=	FALSE
+export DISABLE_WDS_SCAN			=	TRUE
+export DISABLE_WLFIRM_LOAD		=	TRUE
+export IGNORE_WLFIRM_SIGNCHECK	=	FALSE
+export DISABLE_SLEEP			=	TRUE
 
 # COMPILE SWITCH ※最終ROM作成時は、全てTRUEにセットする
 export LOAD_APP_VIA_WRAM	=	FALSE
@@ -115,6 +116,10 @@ ifeq ($(DISABLE_WLFIRM_LOAD),TRUE)
 MACRO_FLAGS += -DDISABLE_WLFIRM_LOAD
 endif
 
+ifeq ($(IGNORE_WLFIRM_SIGNCHECK),TRUE)
+MACRO_FLAGS += -DIGNORE_WLFIRM_SIGNCHECK
+endif
+
 ifeq ($(DISABLE_SLEEP),TRUE)
 MACRO_FLAGS += -DDISABLE_SLEEP
 endif
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index d9a8b52c..ea1530dd 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -33,8 +33,6 @@
   definitions
  */
 
-#define IGNORE_SIGN_ERROR            0
-
 /* LCFGの無線ファームバージョンをタイトルＩＤとしてそのまま使う場合 */
 #define USE_LCFG_STRING              0
 
@@ -285,20 +283,14 @@ BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
     {
         OS_TPrintf("[Wlan Firm]  Wlan Firmware authentication has failed.\n");
 
-#if (IGNORE_SIGN_ERROR == 1)
-        
-        /* continue verifying process even though decryption fails
-           in the case of bonding option = 0x01 (support ARM9/ARM7) */
-        if (!( HWi_WSYS08_OP_OP0_MASK == SCFG_ReadBondingOption() ))
-        {
+#ifdef IGNORE_WLFIRM_SIGNCHECK
+        OS_TPrintf("[Wlan Firm]  But installation continues.\n");
+        if ( 0 )
 #endif
+        {
             SYSM_Free(signHeap);
             return FALSE;
-
-#if (IGNORE_SIGN_ERROR == 1)
         }
-        OS_TPrintf("[Wlan Firm]  But installation continues.\n");
-#endif
     }
 
     SYSM_Free(signHeap);