マスタエディタ:

・Jpeg署名(For User)単独で指定していたときには警告を出していたが、エラーにしたほうがいいらしいので変更。
・アクセスコントロール情報の欄に"AES-SlotB(Jpeg)"と出していたが、わかりづらいらしいので、"Jpeg Signature"に変更。


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

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp

@@ -187,19 +187,19 @@ void Form1::setSrlForms(void)
 	}
 	if( this->hSrl->IsAesSlotBForJpegEnc == true )
 	{
-		acc += "AES-SlotB(Jpeg Launcher).\r\n";
+		acc += "Jpeg Signature for the Launcher.\r\n";
 	}
 	if( this->hSrl->IsAesSlotBForJpegEncUser == true )
 	{
-		acc += "AES-SlotB(Jpeg User).\r\n";
+		acc += "Jpeg Signature.\r\n";
 	}
 	if( this->hSrl->IsAesSlotAForSSL == true )
 	{
-		acc += "AES-SlotA(SSL).\r\n";
+		acc += "AES-SlotA(SSL Client Cert).\r\n";
 	}
 	if( this->hSrl->IsCommonClientKeyForDebugger == true )
 	{
-		acc += "commonClientKey(Debugger).\r\n";
+		acc += "commonClientKey(Debugger System Menu).\r\n";
 	}
 	this->tboxAccessOther->Text = acc;
 

build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp

@@ -108,19 +108,19 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet(
 	}
 	if( hSrl->IsAesSlotBForJpegEnc )
 	{
-		access += "AES-SlotB(Jpeg Launcher). ";
+		access += "JpegSign for the Launcher. ";
 	}
 	if( hSrl->IsAesSlotBForJpegEncUser )
 	{
-		access += "AES-SlotB(Jpeg User). ";
+		access += "JpegSign. ";
 	}
 	if( hSrl->IsAesSlotAForSSL )
 	{
-		access += "AES-SlotA(SSL). ";
+		access += "AES-SlotA(SSL Client Cert). ";
 	}
 	if( hSrl->IsCommonClientKeyForDebugger )
 	{
-		access += "commonClientKey(Debugger). ";
+		access += "commonClientKey(Debugger System Menu). ";
 	}
 
 	// 使用ライセンス

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

@@ -679,7 +679,7 @@ void RCSrl::mrcAccessControl(FILE *fp)
 				(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") );
+				this->hErrorList->Add( this->makeMrcError("JpegSignAccessUserNand") );
 			}
 		}