From af19fa786054b9b9bc70f54851d3823b188424a5 Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Thu, 12 Mar 2009 10:41:18 +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:JpegSign=E3=81=AA=E3=81=97=E3=81=A7SD?= =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=AB=E3=82=A2=E3=82=AF?= =?UTF-8?q?=E3=82=BB=E3=82=B9=E3=81=99=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AE?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=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/TwlToolsRED@243 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11496448 -> 11496448 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 73216 -> 73216 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 22906 -> 12130 bytes .../MasterEditorTWL/srl_mrc.cpp | 6 ++++++ .../MasterEditorTWL/resource/mrc_msg_e.xml | 5 +++++ .../MasterEditorTWL/resource/mrc_msg_j.xml | 9 +++++++-- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 84cd5f80cebba8bbd8ae0a0353d0afe7052049d0..80ab8cde42dd90597ee00ab986785952bffde5be 100644 GIT binary patch delta 3966 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 A%>V!Z delta 1246 zcmYk6T}&KR6vywGnH`q>VrO=`Agpu>tu%EBuw9!;=}3)-*O6Yuc)BK4?_z1CcLFC}Nl?3)4@6jee z6U}&={+APPYIWFMbPx}e?alhXfhu4CB9XBo@)GhppGD2N{OqdGn-s?S$W{E=2q;Ai z^G1`yM@eopCLh;-p_Cd0d(39h*HKI_LinHAqJxXjD{^>uAmN2m{DFPH3a>nCLNOXg z<}h3nghG7vk!l`pDJcL?x*-HLy!%j60fr5GmcfU09dmdv=Hv@6gbe{0eWQd&J3PP> z+bzJhH#LmKPGPiTD@H=2=o}65AKvQKV22os-6xV*(fU0V+TcMbpTh8R1uk|5(dwE` zheI^Lcjh0_7oOp(UDxF|x^eQng28wHPB*&XMz&`_8EKC}rq_i^m&wgDeg&=Z+4MU) zcpN)vi%SRZYhJ{+QximZCd#>&3AEo zAPi{T7Y|N+4n1h`X}q#j4z<`hIETj@Owf4epaVWl3<174Sc;ANTKVnse#ln)0G#qm zxp3EaX5nKrZiT(Z>Tx9W1m?3QZyGwSisRu6AD1er!;2|y(X`1-#*h6|78KyV%4JYR zlhnM9)>tXGxDQgt`*CsU-`mBdGgh4o5JaGY4w_DN0D zyidG|;yI~_m0ch<7~8=vN^vuZ{lvn4l$zk5q~_r>zXc$(0_phxT*_T?!%;|0Z1X1F zm-i;!q9v;z!u`f3eErW0{ErD6@aW3j++8n3)YRmG_?NVjwJb{fidZc2y3}mqufDT03z8v6o_*)V2|8#KInxnqYCkM6JE9@tc!R0cK_*xt#{wQM0q4q$dJ! z6;J$I3A_35lmqaisqL8+CADBf{fCDFJi2fjuy3XrhmYy}`TPiEmNe{aK8cNsy3lfc zE{Ln6a88xiRL6(+4jT~`VNa9qCyy}t4;t41bX1z}QK3Kgzz6O^{A7M0H()`m@P8ZW BYZ3qe diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index ec57ab6f6d0267d0e4f5015aa8d1ad93a2a9f80b..382db7413d63c1afa07cbab3e524acf5e513e5ab 100644 GIT binary patch delta 266 zcmeyhiSbd~1`9TR3kG8bLm)I`FaoknHfxG*X4?FV!-i$@DqfYzHl{M0>x3j2(UncE zm5ty0!CHh-(15`b)r85KqUM{=sfMslmg8cZY{7bD@;?!t$!io8HcRM4abc?8+-z11 zGR6_Z7}L!WPBu(fq-telH(#?>V4QrFY}UMeP!_3 PVEtr8FVW2(Lb_N0hm<`R delta 3013 zcmcImOH5o<82)D{qkuD=0S1Sm!(8sDw4)3MD74x%k(4%V8mVbjd=Lrq0Fl?o474VO zSy^K>Q8;Vbv~j74=}nV1(FI+Yy6D10jT^0Xr%i0sjZqhV=Unc+=iZt6Sg@GK`Jdna zIRAfsc=?aZzK{0@b{?St+DHAgSN`tjUEzJkYT#;sXOpe1=_ zUZ)J%96l6$XuZ8PSfVAcRmSy1GvC$ufMbMTPbemNIT2TQBMq8!+Br)FxGAaj+KigD=y3axbDP|aAXRIdy=xyD5&!7InZ;+$7y;6x$$th)^6o@Gxeyk5{&u0 z#WprVC10eESj`@I!|%%(f8Kv^N2E-7_@AOPws+HFTP@{{&;KyjHd<1)P}W)i}T z%5$0Fw?iEwLlrYaIVo#pCXWp0DCx5_O2_CBouCmq42sB$$*aYgLdJAR7SJTi$agQo z!_Bor6#6<&;|e|JC*8Om>J>HYb2os|6@I6le;B#Ji=hyIGNKum+Fop|As6hD{nPJO z=WF@_em?TG(5^!o_;5oiVkSvR1n+8!axEB0ih@5O(-ov3H3EDYC(!_NqAB<-{TTl> z*4)%9sabsIxi5BHTK+cH?bGjX&PFIT8ZU?yI z%Cj7#?8SI=Pc2zz@GG#nFP>6T;>grk4ic-u{$iiAb(UNXXM097NN;9~{u}#(eZcN8 zm3q%rB6Wsk!3w;)y=BNjd@m2*v77LHm1*=7`xO7K0R=ys?hG=FA)CZ|>hD@}y&{IE zM#tIP?4xrP_Q`t{w#r^$ekSIDrJ>PR?4ks|&VHYI3R0X+vk@t2hNr>CyDyy`9RqEQ zO>F7+V;~ISqxc3iT~3{G49!K#@q_iZDps-Fi)6b{4Pfh5<->)+yQ8)XNgq9q1t7B% zFsmg>eo_t;XSHb9 zo9YW<39`>YW(is|;4I)ggxkRI8QgmOij!zIp;^S!a|x2uc#o7DrK3Xv0H17XIcyqV zf{=KPibsoSG6Ok{hOx8e@N26}pyuuq09F7aPZ@qKos3(-YIKEt#(qR+-@ru~KM~II P_tUNa!ZyB1pWE>_(u}a3 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp index d2cb7f7..7aedb41 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp @@ -681,6 +681,12 @@ void RCSrl::mrcAccessControl(FILE *fp) { this->hErrorList->Add( this->makeMrcError("JpegSignAccessUserNand") ); } + // Jpeg署名を有効にせずにSDにアクセスする場合には確認のメッセージを出しておく + if( (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("SDJpegSignAccessUser") ); + } } if( this->pRomHeader->s.access_control.common_client_key_for_debugger_sysmenu != 0 ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml index 5e50e35..0904aed 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml @@ -292,6 +292,11 @@ Jpeg signature(JpegSign) is configured. 1b41b7FalseTrue + + Access Control Information + It is necessary to append and verify the Jpeg signature(JpegSign) if reading and writing the Jpeg image to the SD Card is configured.(Otherwise, ignore this warning.) + 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 769ffe1..59c61a0 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml @@ -264,12 +264,12 @@ 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア - 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク繝ェ繝シ繝峨い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ェ繝シ繝峨い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1b41b7FalseTrue 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア - 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク繝ゥ繧、繝医い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 + 蜀咏悄繝繝シ繧ソ繝吶シ繧ケ縺ク縺ョ繝ゥ繧、繝医い繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲 1b41b7FalseTrue @@ -292,6 +292,11 @@ Jpeg鄂イ蜷(JpegSign)縺梧怏蜉ケ縺ォ縺ェ縺」縺ヲ縺縺セ縺吶 1b41b7FalseTrue + + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア + Jpeg逕サ蜒上rSD繧ォ繝シ繝峨↓隱ュ縺ソ譖ク縺阪☆繧句エ蜷医↓縺ッJpeg鄂イ蜷(JpegSign)縺ョ莉倅ク弱→讀懆ィシ縺悟ソ隕√↓縺ェ繧翫∪縺吶ョ縺ァ縺疲ウィ諢上¥縺縺輔>縲(Jpeg逕サ蜒上rSD繧ォ繝シ繝峨↓隱ュ縺ソ譖ク縺阪@縺ェ縺蝣エ蜷医√%縺ョ隴ヲ蜻翫r辟。隕悶@縺ヲ縺縺溘□縺縺ヲ讒九>縺セ縺帙s縲) + 1b41b7FalseTrue + 繧「繧ッ繧サ繧ケ繧ウ繝ウ繝医Ο繝シ繝ォ諠蝣ア {0} 縺ク縺ョ繧「繧ッ繧サ繧ケ縺ッ險ア蜿ッ縺輔l縺ヲ縺縺セ縺帙s縲