|
@@ -798,6 +798,7 @@ namespace MOKA_Factory_Tools
|
|
|
keyInfo.Playready = jObject["playready"].Value<string>();
|
|
|
keyInfo.Hashkey = jObject["hash"].Value<string>();
|
|
|
keyInfo.YouTube_KEY = jObject["youtubekey"].Value<string>();
|
|
|
+ keyInfo.ACASKey = jObject["acaskey"].Value<string>();
|
|
|
|
|
|
WriteDID.Checked = (keyInfo.DID.Length > 0 && m_writedid.Text != LResource.Skip);
|
|
|
if (WriteDID.Checked)
|
|
@@ -856,6 +857,9 @@ namespace MOKA_Factory_Tools
|
|
|
WriteYouTube.Checked = (keyInfo.YouTube_KEY.Length > 0 && m_writeYouTube.Text != LResource.Skip);
|
|
|
if (WriteYouTube.Checked)
|
|
|
Log.WriteGetKeyLog("\r\nLocal DB YouTube_KEY=" + keyInfo.YouTube_KEY);
|
|
|
+ WriteACASKey.Checked = (keyInfo.ACASKey.Length > 0 && m_writeACASKey.Text != LResource.Skip);
|
|
|
+ if (WriteACASKey.Checked)
|
|
|
+ Log.WriteGetKeyLog("\r\nLocal DB ACAS_KEY=" + keyInfo.ACASKey);
|
|
|
WriteDSN.Checked = midListNow.keytype == null ? false : midListNow.keytype.ContainsKey("DSN") && m_writeDSN.Text != LResource.Skip;
|
|
|
WritePSN.Checked = FunctionSettingNow.BarcodeWrite;
|
|
|
|
|
@@ -1676,6 +1680,7 @@ namespace MOKA_Factory_Tools
|
|
|
string PEKpath = "";
|
|
|
string Playreadypath = "";
|
|
|
string Hashkeypath = "";
|
|
|
+ string AcasKeypath = "";
|
|
|
|
|
|
if (WriteDID.Checked)
|
|
|
{
|
|
@@ -1696,7 +1701,6 @@ namespace MOKA_Factory_Tools
|
|
|
MessageBox.Show(LResource.GetDIDError + "\r\n" + error);
|
|
|
goto end;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
if (WriteMac.Checked)
|
|
|
{
|
|
@@ -1730,7 +1734,6 @@ namespace MOKA_Factory_Tools
|
|
|
keyStream.Add(Stream);
|
|
|
keyReader.Add(Reader);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1835,7 +1838,6 @@ namespace MOKA_Factory_Tools
|
|
|
keyStream.Add(Stream);
|
|
|
keyReader.Add(Reader);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1898,7 +1900,6 @@ namespace MOKA_Factory_Tools
|
|
|
keyStream.Add(Stream);
|
|
|
keyReader.Add(Reader);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1982,7 +1983,6 @@ namespace MOKA_Factory_Tools
|
|
|
keyStream.Add(Stream);
|
|
|
keyReader.Add(Reader);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1991,6 +1991,26 @@ namespace MOKA_Factory_Tools
|
|
|
goto end;
|
|
|
}
|
|
|
}
|
|
|
+ if (WriteACASKey.Checked)
|
|
|
+ {
|
|
|
+ if (GetLocalKeyCount.GetLocalHexKeys(orderNow, "ACAS_KEY", FunctionSettingNow.localACASKeySize, out FileStream Stream, out BinaryReader Reader, out string acaskey, out AcasKeypath, out error, errorDBNow, ref localmidList, SN))
|
|
|
+ {
|
|
|
+ keyInfo.ACASKey = acaskey;
|
|
|
+ Log.WriteGetKeyLog("\r\nLocal ACASKey=" + keyInfo.ACASKey);
|
|
|
+ if (Stream != null && Reader != null)
|
|
|
+ {
|
|
|
+ keypath.Add(AcasKeypath);
|
|
|
+ keyStream.Add(Stream);
|
|
|
+ keyReader.Add(Reader);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Log.WriteErrorLog(error);
|
|
|
+ MessageBox.Show(LResource.GetACASKeyError + error);
|
|
|
+ goto end;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (localmidList.host != null)
|
|
|
{
|
|
|
if (ClientTypeText.Text.Length == 0)
|
|
@@ -2006,7 +2026,6 @@ namespace MOKA_Factory_Tools
|
|
|
SetTextStatus(ProjectIDText, localmidList.projectid);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else if (!preloadNow)
|
|
|
{
|
|
@@ -2262,15 +2281,15 @@ namespace MOKA_Factory_Tools
|
|
|
goto end;
|
|
|
}
|
|
|
}
|
|
|
- if(WriteEDIDPID.Checked)
|
|
|
+ if (WriteEDIDPID.Checked)
|
|
|
{
|
|
|
keyInfo.EDIDPid = midListNow.keytype["edid_pid"];
|
|
|
}
|
|
|
- if(WriteEDIDName.Checked)
|
|
|
+ if (WriteEDIDName.Checked)
|
|
|
{
|
|
|
keyInfo.EDIDModelName = midListNow.keytype["edid_model_name"];
|
|
|
}
|
|
|
- if(WriteACASKey.Checked)
|
|
|
+ if (WriteACASKey.Checked)
|
|
|
{
|
|
|
if (CommonMethod.GetKeys(midListNow.host, "ACAS_KEY", SN, midListNow.keytype["ACAS_KEY"], errorDBNow, out string acaskey, out error, orderNow, out string md5))
|
|
|
{
|