Mirrors/XCI-Explorer
2
0
Fork 0
mirror of https://github.com/StudentBlake/XCI-Explorer synced 2024-11-10 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

C# function introduced for better computational efficiency

Browse source 
Logic improved, masterkey version larger than masterkey0f supported, code optimized.
This commit is contained in:
zzpong 2020-03-08 22:56:03 +08:00
parent 156a8634a3
commit 7de76c8b39
2 changed files with 25 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
XCI_Explorer/MainForm.cs
View file

@ -124,7 +124,7 @@ namespace XCI_Explorer
where x.Length > 1
select x).ToDictionary((string[] x) => x[0].Trim(), (string[] x) => x[1]);
Mkey = "master_key_";
string MkeyL = "master_key_";
string MkeyL = "master_key_";
if (NCA.NCA_Headers[0].MasterKeyRev == 0 || NCA.NCA_Headers[0].MasterKeyRev == 1)
{
Mkey += "00";
@ -132,17 +132,18 @@ namespace XCI_Explorer
else if (NCA.NCA_Headers[0].MasterKeyRev < 17)
{
int num = NCA.NCA_Headers[0].MasterKeyRev - 1;
string capchar = num.ToString("X");
Mkey = Mkey + "0" + capchar;
char cache1 = capchar[0];
int cache2 = cache1 + 32;
char lowchar = (char)cache2;
string capchar = num.ToString("X");
string lowchar = capchar.ToLower();
Mkey = Mkey + "0" + capchar;
MkeyL = MkeyL + "0" + lowchar;
}
else if (NCA.NCA_Headers[0].MasterKeyRev >= 17)
{
int num2 = NCA.NCA_Headers[0].MasterKeyRev - 1;
string capchar = num2.ToString("X");
string lowchar = capchar.ToLower();
Mkey += num2.ToString();
MkeyL += num2.ToString();
}
try
{
@ -151,16 +152,15 @@ namespace XCI_Explorer
}
catch
{
int flag = 1;
}
try
{
MkeyL = dictionary[MkeyL].Replace(" ", "");
return true;
}
catch
{
return false;
try
{
MkeyL = dictionary[MkeyL].Replace(" ", "");
return true;
}
catch
{
return false;
}
}
}
@ -649,33 +649,23 @@ namespace XCI_Explorer
else if (strArray[0] == "Master Key Revision")
{
string MasterKey = strArray[1].Trim();
int keyblob;
if (MasterKey.Contains("Unknown"))
{
int keyblob;
if (int.TryParse(new string(MasterKey.TakeWhile(Char.IsDigit).ToArray()), out keyblob))
{
MasterKey = Util.GetMkey((byte)(keyblob + 1)).Replace("MasterKey", "");
}
TB_MKeyRev.Text = "MasterKey" + MasterKey;
}
else
{
int keyvalue;
char masterkeychar = MasterKey[2];
if (masterkeychar - 'A' < 0)
{
keyvalue = masterkeychar - '0' + 1;
}
else
{
keyvalue = masterkeychar - 'A' + 10 + 1;
}
MasterKey = Util.GetMkey((byte)keyvalue);
TB_MKeyRev.Text = MasterKey;
}
else
{
MasterKey = MasterKey.Split(new char[2] {'x',' '})[1];
keyblob = Convert.ToInt32(MasterKey, 16);
MasterKey = Util.GetMkey((byte)(keyblob+1));
TB_MKeyRev.Text = MasterKey;
}
break;
}

2
XCI_Explorer/Util.cs
View file

@ -53,7 +53,7 @@ namespace XCI_Explorer
case 10:
return "MasterKey9 (9.0.0-9.0.1)";
case 11:
return "MasterKey10 (9.1.0)";
return "MasterKey10 (9.1.0-9.2.0)";
case 12:
return "MasterKey11 (?)";
case 13: