From 71a47edf41aceb44ab23c1f3e75f3cf2b40dfdff Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 16 Dec 2008 04:13:02 +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:=E7=BD=B2=E5=90=8D=E3=81=8C=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E3=81=AASRL=E3=82=92=E8=AA=AD=E3=81=BF=E8=BE=BC?= =?UTF-8?q?=E3=82=93=E3=81=A0=E3=81=A8=E3=81=8D=E3=81=AB=E3=81=99=E3=81=A7?= =?UTF-8?q?=E3=81=AB=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BE=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=82=8BSRL=E7=94=A8=E3=81=AEROM=E3=83=98=E3=83=83?= =?UTF-8?q?=E3=83=80=E3=81=8C=E4=B8=8A=E6=9B=B8=E3=81=8D=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=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/TwlToolsRED@87 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11348992 -> 11365376 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 64512 -> 64512 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 20262 -> 20262 bytes .../MasterEditorTWL/Release/BuildLog.htm | Bin 20502 -> 20502 bytes .../MasterEditorTWL/MasterEditorTWL/srl.cpp | 18 +++-- .../MasterEditorTWL/MasterEditorTWL/srl.h | 6 +- .../resource/sheet_templete.xml | 75 +++++++----------- 7 files changed, 41 insertions(+), 58 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index bb67e855d53b9b583e379f5bce16be3b05d3c754..b95690b3cb1f841585179a096c3951c3727f0b71 100644 GIT binary patch delta 21334 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 O&tLM}iI-aYp#K6QdA=F| diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 0fc635e809d4c9939dd149dc621362b81ef59e98..82bf2faf4210486dd43d3de5ab3fb9bce0532c50 100644 GIT binary patch delta 3748 zcma)<3s6+o8OQIryDSe;kPrp62&h$~0y-2CtZcPYLt+I9m?l92q5&UC3Ywbu=%R_^ z+bW;Ns!`Etj7eHq_N30>fDlcau`vn3)JNM$H624zm6}nYCXxRC>!HI;ai*XC_xs=9 z{mwm)d-m?7qSH~)>F{p0)o9sbk5P$IYbUC7`4XSgCEBq|yn#-6$C0X5%5{e)pfSf@ zlB~;|2kfYHWm!M5ENeRSFq8?61=FJf2M4)S7owl^Zyh5`!?FYV;^ad-(zn7sRq9PS z-G7DrI3!68lNTapx>N|xhx)5;MP$h-=XhEAz-z&Up!1;-Iy&;HP?aDr#ClYkz8xEA zhlb^RdjzK}^l0gzVM)sQ+RBED^7qFgb@uRW{bJ_e#7jJh`0(xIh_<^ox)hE_;CQN~ z?@sv0cHYGpb<+=y^tG?LWcjpT+It-O&NP=Z*k!TQYIR6`=8%3(Ayt!`Lj2eIA}?Ix zoRNBZZmp8CjrINN6A@qnFOwY*+f8=&ivD-&*CH?RB}w;W`OWB9sJ;hbBO& zP%@MQr9d3pWaLRunmL|nG!L2&Jp+|MrO*OsA+!iutSsBQD>ZYne1$`7)hR0epIiosedcS) z%8ZiO;vg9=?J}g~ABX1Ia-}FqCzUp-$_2@?I3q$i<>QTQaxE>wflVP9Kg^S=vOVYtgAKZ&~m4IQd%sHtr2RFPB|K*)L_Z0 zUL-f$-P&Ez7$|c~PDnyxq$8LEOaDe;{}#3B#;tDU+dNHiTL!dYY*F&kmUS{!E=b?H zaNSxErQ~?|HGOScs;!fDJf~#PjsgA^*uQgt_U;N%l6&)86(}`3yD;FI^4r?Gdxs++ z9haJPZ*u#xf>nx{wG<@AOOn&2Z|w_p$-$#q#p~po80-i++d2+|J!%$Vs)tt?12L9C zxI6xM5uY}+5+X~3RzZwCPE6C$!;#Pv z=E~eFv_qj)FzjTlVH4o7hy1bCFdkOo<9o=!78?Xj(>~#aJb_3x=jbQF6Q>)- zUx>*BhQ7${0IM%aR?gSax}j;L*X>*;W_;V!{XrIgXgX|Z5Ws01H+nnux7)~8^#@R z5gz}ozZr%;Jl1s_a2MY&kl*@atU`1cM&Aife8;fi@ZS(1BC+2&V8(;+!~+dWfRBP_ zr1Yqp=&$qO#u&(&0(?A(Tx=Leoe9qit~M+YJ`JAniedC?;oZpV4P)Cq@N9d`Fg}|$ zz%y#e(7!*9o5DI%7zNq@|0MDUhQ-6z!!tfMjI%xm&)10yJ=i*YgTlc!AhU+I@e|W_ zzhT3`9EY8j#6|x|-0wAdICI|5Fenyc!+}r)#Ncfrqeel~p>gJzZMoD8-ooy>iSVrB zBZn*(;@0O_vLP}~EQfo6Fwa1a?s15WtH8n-C?6tw8Y1HWGayD0L`Kbp*zp2$oQhly zvF$3uI9ZQjYv|aJ8|xJV*CCTdLJJ|r2B^D}jqvPbyJ62FAA;CPyh9^$5fo{tDw*%1X{k^XUW+>wbsvbl1(mgDDtn zCNfzZvt>@&kSsW0GpAFdh3YqrDpNA5IiD3`AV2aJ@!dmYnHgl8;4 z=903t|JNzvjSSb{)uk!C2rnJJ(YeThErIuV+rLg6=KA#i{cA#9(Xp3) zrDW4*`6K_IHrO({-=zn79punU>y?D>2$GJ^XW#FSm+HE0N_Tu7V#~?Wa;bVXRC~S} zs#LSI{HDm)s%-IH^-6V%i^~>p7K3*AjzlRHr7vC|qW=5ptn;ez{?h$!s?WB@sQbK$ zNkx0O>hZplt<_5WE!HKM+w1&eoxC7OpXp3ilDN#JUB9@ar1AC9Si%@R{Z6g=56`X0 AjsO4v delta 3214 zcmZ{m3s98T702)W_Q8sP%R|752!ijFhafS*;vzOaFrr3HMiE4fQKxEAw8q!2O-%D3 z3~&;BM?**k5`(a}aj?c@Tbr?Il}3`ZQsSf9Q9x50C6PKEw*RwSrke>pv*$bi?|09A zeD~hH-{r=GvG7f%+#2Gp*A{WPNkATb7|Vp$!_}}q&!TYhHkfnAZH+jwvU%% zX>-^dUshLGo>c~-AealNB>d2TFx;iWg&GpEBuFOH<~XO!RNux07(vHt?K`;$J$aQa zAw`-Sn)V*7937$NCYFc9{#XjJ2|gYv=if^YyVLVeuf%;1?x#uBGojfqufVF z{;&fzea1=YUesW%SQ(R;j?DS+3^>p2WJK=C-{@cYj*6n_)F)830KQP?uJ_Ab47~)N z4_^u|fcI1sg%4N>@pSJ^0yQn2L2~9r3U=F7ds(z}7sMD;vnHReMwMeqqA7N{O?HzU z@z?5=2DKDL@Dxx)(Oo)P6-Y5F{y|sk;#AzKtCEb3C#Ye6g!$ot38$&_g&5Vjw!kdM z^{()SQZm-elK(+VU(@<2c9U5Mn(~u{bac%!`gvgudET+fM0#^gA=#@AP}9ap8ALKR zr=n=JT3xbFR(BiKTa4;$X1Z|t0D0cFQNz<#TK()kvR~RsJ8$IBwP=TOxI6(AwyBm5 z6^|lE<^%fdC9`rQ8PYNUQ_r2>qGP#XGKxYAlij5`(kgjcGkJ`bJ4orGXJ7pl&0p?O zo|hex+^^kMx63E>&IpgI^0i2nNb4oN@p>dV61t^{F4TBsfNFd_SV|ko?0c$yf0fCS zfyN%`ee}b5yysQd;UFuyzqu^W(~+A+>+iZajM*QM`%qgD3 z+Smd2Aac@3_<3FVfMy9`)zCb^I?XtDhD8XT>sg3=9}nLJZAE-ev*FNtG<(^PmHHT3 zRG!XgDI=)$*3HUyU2>}0{jO7Hr3IiKYy%>%8tZ$=<{^BG3wM_Y|BeA{kbWlCc9Y6F z_DkuA;TzZlIOnsa!TIEw2xs;PoR^Pn7Q8Pn7n(v>k0jS!yNpy@cEw5~%A^(@f6pMf z;HiEN4z+#39!ZU-e^a?Ej8awwsf)iJV{umKN9HvqXr9@@m#^iAadW#lAt*+ zU9*wUhcNAIb2N*Co(s+PreEG$nzi;a%HH@A*-kZ0;c2=KHW;y8=W~B|p+gb7G~?xJ zgJzq6x!3bS-o~>2p82?Yo~-==YC2ESXxnpi0u96~Xu;*=b$d zeA?iS?WZ-0`nbc%6Yw~kJLbii183t6t_LHQKy%(w&6qpk@o*QsuWkV}+g^BI-F?tp z_kd>e5D&uHjtTK2U*baCyzfIoe2nPZffOG-8ol)GsvF>ajoyUjMmsbsLhOXI4Mb93 zUJwN5g=oe+6c-y}xF6$}94~l^X1sb?(3Wh7Yz+}aE-t)1W^2Y;*K9QOE6{8QH5&(gShH5mxcqO>T=y%@ zIOXrS@Y!%(vtsBDXwJLS%bdQUU&0NW86_-vFcHw4n5x-B&{hVpG|gD2Lo?3Mj6YKz zW&nFqv$4=mX;!EimoGE0n9P@J7!SP#8vjnQLo*)CF3q0zV=rh{su};i%b@WSm70x$ zUcmtNzGkfJp&2(gG~}l~3C#<6N;4je2bu@-iDo>Qvznb_=6i!)jY=fPS&x%Tn|0~u zx&{yHOKAMWMa{Uk4rpHBPR)3Z8aWBZr!42NbwM-cQr?0zS1s0sf+=HVJ9 zK}YZz2AklQmW<^R znn*35CXsvV3Cj4zAMvg|=KFZ5JsL@~&vj9@bEfZOB5!N4yIESPCF%`)bQGef} zYWQWN-}Z-Jeo^AFY;^znA{u)wroS=t9?etK{p*1SrJc?qmotzbUFB_UlLc^^ME$<39Qa&~ zPmm60bR9rXT5fi+GGoFfxp}>XHRI$HwtPTI7j&JQU)sK8l*J;!pvREJkjPNNpfuS~ LNp>@jgA_jijm$=C delta 360 zcmZ2Bk8#;N#tmj{!UhcH3`Puw3}y@#K++sYT1@_HV!XMAErbWFs-PUt#-p0wQTVr9mJO>*;k3v0&7Cv5qElFsNlH@~!f$ta6OfW)Kxo2X#9+Z-&S11TkZmdtHi^mcmeP~|$vABe6P92E zDlo^;*(l=AflUIWbMrr$1t9w@Fm!EH4ivyDA!)yQ9?jy)p KOo@#Ssr&$1=R#8e diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 82503a5..4902833 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -56,14 +56,15 @@ ECSrlResult RCSrl::readFromFile( System::String ^filename ) (void)fseek( fp, 0, SEEK_SET ); // ROMヘッダはsrlの先頭から // 1バイトをsizeof(~)だけリード (逆だと返り値がsizeof(~)にならないので注意) - if( fread( (void*)(this->pRomHeader), 1, sizeof(ROM_Header), fp ) != sizeof(ROM_Header) ) + ROM_Header tmprh; + if( fread( (void*)&tmprh, 1, sizeof(ROM_Header), fp ) != sizeof(ROM_Header) ) { return (ECSrlResult::ERROR_FILE_READ); } #ifdef METWL_WHETHER_SIGN_DECRYPT // まず署名チェック - r = this->decryptRomHeader(); + r = this->decryptRomHeader( &tmprh ); if( r != ECSrlResult::NOERROR ) { (void)fclose(fp); @@ -71,6 +72,10 @@ ECSrlResult RCSrl::readFromFile( System::String ^filename ) } #endif //#ifdef METWL_WHETHER_SIGN_DECRYPT + // 署名チェックを通ってからフィールドのROMヘッダにコピー + // (そうしないと不正SRLを読み込んだときにROMヘッダが上書きされてしまう) + memcpy( this->pRomHeader, &tmprh, sizeof(ROM_Header) ); + { // ファイルを閉じる前にROMヘッダ以外の領域から設定を取り出す (void)this->hasDSDLPlaySign( fp ); @@ -687,13 +692,12 @@ ECSrlResult RCSrl::signRomHeader(void) // // ROMヘッダの署名を外す // -ECSrlResult RCSrl::decryptRomHeader(void) +ECSrlResult RCSrl::decryptRomHeader( ROM_Header *prh ) { u8 original[ RSA_KEY_LENGTH ]; // 署名外した後のデータ格納先 s32 pos = 0; // ブロックの先頭アドレス u8 digest[ DIGEST_SIZE_SHA1 ]; // ROMヘッダのダイジェスト u8 *publicKey = (u8*)g_devPubKey_DER; - ROM_Header rh; // <データの流れ> // (1) 公開鍵で復号した結果(ブロック)をローカル変数(original)に格納 @@ -730,7 +734,7 @@ ECSrlResult RCSrl::decryptRomHeader(void) #endif //METWL_VER_APPTYPE_USER // 署名の解除 = 公開鍵で復号 - if( !ACSign_Decrypto( original, publicKey, this->pRomHeader->signature, RSA_KEY_LENGTH ) ) + if( !ACSign_Decrypto( original, publicKey, prh->signature, RSA_KEY_LENGTH ) ) { return ECSrlResult::ERROR_SIGN_DECRYPT; } @@ -745,8 +749,8 @@ ECSrlResult RCSrl::decryptRomHeader(void) } // ベリファイ // ROMヘッダのダイジェストを算出(先頭から証明書領域の直前までが対象) - ACSign_DigestUnit( digest, this->pRomHeader, (u32)&(rh.certificate) - (u32)&(rh) ); - // this->pRomHeader はマネージヒープ上にあるので実アドレスを取得できない + ROM_Header tmprh; // マネージヒープ上にある場合実アドレスを取得できないのでサイズ計算用のROMヘッダを用意 + ACSign_DigestUnit( digest, prh, (u32)&(tmprh.certificate) - (u32)&(tmprh) ); if( memcmp( &(original[pos+1]), digest, DIGEST_SIZE_SHA1 ) != 0 ) { return ECSrlResult::ERROR_SIGN_VERIFY; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 1519e9f..61cff12 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -372,9 +372,9 @@ namespace MasterEditorTWL void setRatingRomHeader( u32 region ); // ROMヘッダにフィールドの値を反映させる // ROMヘッダの更新 - ECSrlResult calcRomHeaderCRC(void); // ROMヘッダのCRCを再計算 - ECSrlResult signRomHeader(void); // ROMヘッダ更新後の再署名 - ECSrlResult decryptRomHeader(void); // ROMヘッダの署名を外す + ECSrlResult calcRomHeaderCRC(void); // ROMヘッダのCRCを再計算 + ECSrlResult signRomHeader(void); // ROMヘッダ更新後の再署名 + ECSrlResult decryptRomHeader( ROM_Header *prh ); // ROMヘッダの署名を外す // SRLバイナリから特殊な設定を調べる ECSrlResult hasDSDLPlaySign( FILE *fp ); diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml index 6e04fb4..335f3f5 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml @@ -69,28 +69,6 @@ - - + +