マスタエディタ:ROMチェック項目追加(PhotoAccessとJpegSignの連動)

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@237 7061adef-622a-194b-ae81-725974e89856

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)];
 

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp

@@ -593,9 +593,9 @@ void RCSrl::mrcAccessControl(FILE *fp)
 		{
 			this->hWarnList->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") );

build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml

@@ -262,6 +262,36 @@
 		<sentence>The NTR-compatible region in the Game Card can be accessed.</sentence>
 		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
 	</GameCardNTRAccessSystem>
+	<PhotoReadAccessUser>
+		<name>Access Control Information</name>
+		<sentence>Read access to the Photo Database is not permitted.</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</PhotoReadAccessUser>
+	<PhotoWriteAccessUser>
+		<name>Access Control Information</name>
+		<sentence>Write access to the Photo Database is not permitted.</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</PhotoWriteAccessUser>
+	<PhotoJpegSignAccessUser>
+		<name>Access Control Information</name>
+		<sentence>Jpeg signature(JpegSign) is not configured even if write access to Photo Database is specified.</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</PhotoJpegSignAccessUser>
+	<JpegSignAccessUserCard>
+		<name>Access Control Information</name>
+		<sentence>Jpeg signature(JpegSign) is configured.</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</JpegSignAccessUserCard>
+	<JpegSignAccessUserNand>
+		<name>Access Control Information</name>
+		<sentence>Jpeg signature(JpegSign) is configured even if either write access to Photo Database or access to SD Card is not specified.</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</JpegSignAccessUserNand>
+	<JpegSignAccessSystem>
+		<name>Access Control Information</name>
+		<sentence>Jpeg signature(JpegSign) is configured.</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</JpegSignAccessSystem>
 	<IllegalAccessUser>
 		<name>Access Control Information</name>
 		<sentence>Access to the {0} is not permitted.</sentence>

build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml

@@ -262,6 +262,36 @@
 		<sentence>ゲームカードNTR互換領域へアクセス可能になっています。</sentence>
 		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
 	</GameCardNTRAccessSystem>
+	<PhotoReadAccessUser>
+		<name>アクセスコントロール情報</name>
+		<sentence>写真データベースへリードアクセスは許可されていません。</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</PhotoReadAccessUser>
+	<PhotoWriteAccessUser>
+		<name>アクセスコントロール情報</name>
+		<sentence>写真データベースへライトアクセスは許可されていません。</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</PhotoWriteAccessUser>
+	<PhotoJpegSignAccessUser>
+		<name>アクセスコントロール情報</name>
+		<sentence>写真データベースへのライトアクセスが指定されているにもかかわらずJpeg署名(JpegSign)が有効になっていません。</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</PhotoJpegSignAccessUser>
+	<JpegSignAccessUserCard>
+		<name>アクセスコントロール情報</name>
+		<sentence>Jpeg署名(JpegSign)が有効になっています。</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</JpegSignAccessUserCard>
+	<JpegSignAccessUserNand>
+		<name>アクセスコントロール情報</name>
+		<sentence>写真データベースへのライトアクセスもしくはSDカードへのアクセスが指定されていないにもかかわらずJpeg署名(JpegSign)が有効になっています。</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</JpegSignAccessUserNand>
+	<JpegSignAccessSystem>
+		<name>アクセスコントロール情報</name>
+		<sentence>Jpeg署名(JpegSign)が有効になっています。</sentence>
+		<begin>1b4</begin><end>1b7</end><modify>False</modify><affect>True</affect>
+	</JpegSignAccessSystem>
 	<IllegalAccessUser>
 		<name>アクセスコントロール情報</name>
 		<sentence>{0} へのアクセスは許可されていません。</sentence>