diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 84cd5f8..80ab8cd 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index fe8b8ef..7a013a8 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index ec57ab6..382db74 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ 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縲