From c6e67f1f85f4193865a2fbb615ccd81da966fe95 Mon Sep 17 00:00:00 2001 From: ManicSteiner Date: Fri, 8 Mar 2024 14:56:57 +0800 Subject: [PATCH 1/2] fix MasterKey16 support --- XCI_Explorer/MainForm.cs | 4 ++-- XCI_Explorer/Util.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/XCI_Explorer/MainForm.cs b/XCI_Explorer/MainForm.cs index ca76fda..74852a7 100644 --- a/XCI_Explorer/MainForm.cs +++ b/XCI_Explorer/MainForm.cs @@ -149,8 +149,8 @@ where x.Length > 1 int num2 = NCA.NCA_Headers[0].MasterKeyRev - 1; string capchar = num2.ToString("X"); string lowchar = capchar.ToLower(); - Mkey += num2.ToString(); - MkeyL += num2.ToString(); + Mkey += capchar; + MkeyL += lowchar; } try { diff --git a/XCI_Explorer/Util.cs b/XCI_Explorer/Util.cs index f9b6716..928c6bd 100644 --- a/XCI_Explorer/Util.cs +++ b/XCI_Explorer/Util.cs @@ -38,9 +38,9 @@ public static string GetMkey(byte id) 12 => "MasterKey11 (12.1.0)", 13 => "MasterKey12 (13.0.0-13.2.1)", 14 => "MasterKey13 (14.0.0-14.1.2)", - 15 => "MasterKey14 (15.0.0-?)", - 16 => "MasterKey15", - 17 => "MasterKey16", + 15 => "MasterKey14 (15.0.0-15.0.1)", + 16 => "MasterKey15 (16.0.0-16.1.0)", + 17 => "MasterKey16 (17.0.0-?)", 18 => "MasterKey17", 19 => "MasterKey18", 20 => "MasterKey19", From 5c6bc72f793b9d37757f943a5b2a164a7f804788 Mon Sep 17 00:00:00 2001 From: ManicSteiner Date: Thu, 24 Oct 2024 21:58:45 +0800 Subject: [PATCH 2/2] chore: update keys --- XCI_Explorer/Util.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/XCI_Explorer/Util.cs b/XCI_Explorer/Util.cs index 928c6bd..6f5a2fd 100644 --- a/XCI_Explorer/Util.cs +++ b/XCI_Explorer/Util.cs @@ -40,9 +40,9 @@ public static string GetMkey(byte id) 14 => "MasterKey13 (14.0.0-14.1.2)", 15 => "MasterKey14 (15.0.0-15.0.1)", 16 => "MasterKey15 (16.0.0-16.1.0)", - 17 => "MasterKey16 (17.0.0-?)", - 18 => "MasterKey17", - 19 => "MasterKey18", + 17 => "MasterKey16 (17.0.0-17.0.1)", + 18 => "MasterKey17 (18.0.0-18.1.0)", + 19 => "MasterKey18 (19.0.0-?)", 20 => "MasterKey19", 21 => "MasterKey20", 22 => "MasterKey21",