From 835f91324fefab90ace20bd94e34a92e009d627f Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 12 Mar 2009 05:41:55 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:ROM=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E9=A0=85=E7=9B=AE=E8=BF=BD=E5=8A=A0(PhotoAccess=E3=81=A8JpegSi?= =?UTF-8?q?gn=E3=81=AE=E9=80=A3=E5=8B=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@237 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11496448 -> 11496448 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 73216 -> 73216 bytes .../MasterEditorTWL/AssemblyInfo.cpp | 2 +- .../MasterEditorTWL/Debug/BuildLog.htm | Bin 22906 -> 12114 bytes .../MasterEditorTWL/srl_mrc.cpp | 38 ++++++++++++++---- .../MasterEditorTWL/resource/mrc_msg_e.xml | 30 ++++++++++++++ .../MasterEditorTWL/resource/mrc_msg_j.xml | 30 ++++++++++++++ 7 files changed, 92 insertions(+), 8 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 55040caa128a93b16ce8d587c3929c6381878140..0a09e445e021ed8910ed19de2d445ccb7efd8448 100644 GIT binary patch delta 6589 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 I=JGZF18r;j)c^nh delta 11374 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 ZtI`2gI;cvAROzrPy{$?|Jkrt1{{@I4R&oFU diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 6ad89dbff179bcc6e7266517a4bb00add39d6ca2..991ac1b15ccfafbc489d3d85ade6f61729121edd 100644 GIT binary patch delta 2331 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp index f5d249c..f9fe5dd 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp @@ -31,7 +31,7 @@ using namespace System::Security::Permissions; // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を // 既定値にすることができます: -[assembly:AssemblyVersionAttribute("1.4.*")]; +[assembly:AssemblyVersionAttribute("1.5.*")]; [assembly:ComVisible(false)]; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 3d92771fa22249509f20f934d421e4e044864806..a9cd8cfd4037f34c2c8d29e22dcb640b117dd386 100644 GIT binary patch delta 252 zcmeyhiSbh01~WE(Lk3p{V+JDza|Sa869&`GnxdPTHvi(VVVS&&S7ow|sm$g&Au&dD zWs_@V<2Qe>7GvafL)JZ6Q`CI(In@x>$#Pt5lPy?}O#UarGkJ}I!e$AbC@!EOD5^I% zn-w$i8!;H58DY9P!pVjSL!wqzcJnoB1;)wu-1&f#hRC`$GrGM78HFnN*WH?F@-i<8 U)>j6f4c1Rq^b+0tA*72105?)Q+5i9m delta 2970 zcmcImTWB0r82&d+wr=bs8?#CFl4NJ6TI*uBXA_&&Sdp|zAc$#=)F>@(lFh|vvRU@h zrV?DA1Z$y~-(x$t(zm-L?eZ*whVu_E691Rd9;9l7HJ939HsDF$F0*rDucQ}F92NGg1SH_ zVYCFelA8q`A+{YS&L@6JIMH{j0OoAt>txX5WN;;PfNzHPH5ryd#8F7Qf-fn8!{Pp_ zU|bb^4ImoX9S-k_s=ONPB8*Ca9y7ML_3&UOqVhau_&uYCXA;d$>?$&aYRu*l8v{u_ zMUymv^Kt^I8UsZ}%;q)XEFzW$Bo}B7v0j4gEFznC-IV$UR%aA?78HZo=rU&#VVUAF zZ%vr7;JYn+veVB;cYndZwYQlY-EXuukZVa;B{l9<$JsvAB7HCMNN1O0V;3UB&jj{% z*l|;0!=FFc#r>K;E-Pagp5#cw)e2uqSjkF}N2$cOjR~IV*dt}NgBE8F&v_c=bZ;MD z4C#yvSo?e*e$=P)jdEnMvZngE94?m*&_@DM*ySOh8P$Ku`fh?u}p_pN4x$Htx*orI-8kCRAsODrYwM+aU=4U#=Ip*ZjmW3>Kh@ObwguEu)~YaMh|9_N zpmV^~qw7k@DyTJaN0%=pN+i2GNQq#-xSFwPCp~hK71DAdj;jQ8UO4S~T?g-h2 zyNr_}qtIBlI#_J3A0d+odp_Eu1n2L_US;)3Byy@2DpTAQUy4l;F9+uiOr~HaWhKcJ zzl(3ghvJS(ggA|J;F=|QLj_TO);_0_1 zr$L(*nX3K(PRtN)y=H3D1IIgzb_&KI30&KSL}E~9nVg?Hg+z9iw2j1XC#)_U>O9;@ zC{AuSg~{iVeLT?mP(`QxG)0dA;55!j4*g^eC$5OKL!ZL@D1z$zrRbQu>c2?=vM)lW z0I6kga##-`zykLnI*eL)!dl7dlA3w^UKSv^gg>29tF_T_34qhBonyA~0)*u8mcK)` z$rR*t8bK>q!P`~0fZ9bZ0i3l)U5YhWarnList->Add( this->makeMrcError("IllegalAccessSystem", "HW AES Slot A for the SSL client certification") ); } - if( this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0 ) + if( (this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0) ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessSystem", "HW AES SlotB (JPEG signature) for the user") ); + this->hWarnList->Add( this->makeMrcError("JpegSignAccessSystem") ); } if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) { @@ -648,17 +648,41 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "HW AES Slot A for the SSL client certification") ); } - if( this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0 ) + + if( !this->IsMediaNand ) { - if( !this->IsMediaNand ) + // カードだと写真領域へのアクセスは禁止 + if( this->pRomHeader->s.access_control.photo_access_read != 0 ) { - this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "HW AES SlotB (JPEG signature) for the user") ); + this->hErrorList->Add( this->makeMrcError("PhotoReadAccessUser") ); } - else + if( this->pRomHeader->s.access_control.photo_access_write != 0 ) { - this->hWarnList->Add( this->makeMrcError("IllegalAccessUserWarn", "HW AES SlotB (JPEG signature) for the user") ); + this->hErrorList->Add( this->makeMrcError("PhotoWriteAccessUser") ); + } + // Jpeg署名も禁止 + if( this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0 ) + { + this->hErrorList->Add( this->makeMrcError("JpegSignAccessUserCard") ); } } + else + { + // photoへのライトアクセス権があるのにJpeg署名がないとき + if( (this->pRomHeader->s.access_control.photo_access_write != 0) && + (this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser == 0) ) + { + this->hErrorList->Add( this->makeMrcError("PhotoJpegSignAccessUser") ); + } + // photoやSDへライトしないくせにJpeg署名が有効なとき + if( (this->pRomHeader->s.access_control.photo_access_write == 0) && + (this->pRomHeader->s.access_control.sd_card_access == 0) && + (this->pRomHeader->s.access_control.hw_aes_slot_B_SignJPEGForUser != 0) ) + { + this->hWarnList->Add( this->makeMrcError("JpegSignAccessUserNand") ); + } + } + if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) { this->hErrorList->Add( this->makeMrcError("IllegalAccessUser", "Common Client Key for the debugger system menu") ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 10c49a8..5e50e35 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml @@ -262,6 +262,36 @@ The NTR-compatible region in the Game Card can be accessed. 1b41b7FalseTrue + + Access Control Information + Read access to the Photo Database is not permitted. + 1b41b7FalseTrue + + + Access Control Information + Write access to the Photo Database is not permitted. + 1b41b7FalseTrue + + + Access Control Information + Jpeg signature(JpegSign) is not configured even if write access to Photo Database is specified. + 1b41b7FalseTrue + + + Access Control Information + Jpeg signature(JpegSign) is configured. + 1b41b7FalseTrue + + + Access Control Information + Jpeg signature(JpegSign) is configured even if either write access to Photo Database or access to SD Card is not specified. + 1b41b7FalseTrue + + + Access Control Information + Jpeg signature(JpegSign) is configured. + 1b41b7FalseTrue + Access Control Information Access to the {0} is not permitted. diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml index dbaada5..769ffe1 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -262,6 +262,36 @@ 繧ｲ繝ｼ繝繧ｫ繝ｼ繝丑TR莠呈鋤鬆伜沺縺ｸ繧｢繧ｯ繧ｻ繧ｹ蜿ｯ閭ｽ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺吶 1b41b7FalseTrue + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 蜀咏悄繝繝ｼ繧ｿ繝吶ｼ繧ｹ縺ｸ繝ｪ繝ｼ繝峨い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 蜀咏悄繝繝ｼ繧ｿ繝吶ｼ繧ｹ縺ｸ繝ｩ繧､繝医い繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 蜀咏悄繝繝ｼ繧ｿ繝吶ｼ繧ｹ縺ｸ縺ｮ繝ｩ繧､繝医い繧ｯ繧ｻ繧ｹ縺梧欠螳壹＆繧後※縺繧九↓繧ゅ°縺九ｏ繧峨★Jpeg鄂ｲ蜷(JpegSign)縺梧怏蜉ｹ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺帙ｓ縲 + 1b41b7FalseTrue + + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + Jpeg鄂ｲ蜷(JpegSign)縺梧怏蜉ｹ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺吶 + 1b41b7FalseTrue + + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + 蜀咏悄繝繝ｼ繧ｿ繝吶ｼ繧ｹ縺ｸ縺ｮ繝ｩ繧､繝医い繧ｯ繧ｻ繧ｹ繧ゅ＠縺上ｯSD繧ｫ繝ｼ繝峨∈縺ｮ繧｢繧ｯ繧ｻ繧ｹ縺梧欠螳壹＆繧後※縺縺ｪ縺縺ｫ繧ゅ°縺九ｏ繧峨★Jpeg鄂ｲ蜷(JpegSign)縺梧怏蜉ｹ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺吶 + 1b41b7FalseTrue + + + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ + Jpeg鄂ｲ蜷(JpegSign)縺梧怏蜉ｹ縺ｫ縺ｪ縺｣縺ｦ縺縺ｾ縺吶 + 1b41b7FalseTrue + 繧｢繧ｯ繧ｻ繧ｹ繧ｳ繝ｳ繝医Ο繝ｼ繝ｫ諠蝣ｱ {0} 縺ｸ縺ｮ繧｢繧ｯ繧ｻ繧ｹ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺縺ｾ縺帙ｓ縲