mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Accept all keys from both prod.keys and console.keys

Browse source
This commit is contained in:
Alex Barney 2018-08-27 20:09:23 -05:00
parent e7f5702477
commit 9276a213bc
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libhac/Keyset.cs
View file

@ -121,15 +121,26 @@ namespace libhac
public static class ExternalKeys public static class ExternalKeys
{ {
private const int TitleKeySize = 0x10; private const int TitleKeySize = 0x10;
private static readonly Dictionary<string, KeyValue> CommonKeyDict = CreateCommonKeyDict(); private static readonly Dictionary<string, KeyValue> CommonKeyDict;
private static readonly Dictionary<string, KeyValue> UniqueKeyDict = CreateUniqueKeyDict(); private static readonly Dictionary<string, KeyValue> UniqueKeyDict;
private static readonly Dictionary<string, KeyValue> AllKeyDict;
static ExternalKeys()
{
var commonKeys = CreateCommonKeyList();
var uniqueKeys = CreateUniqueKeyList();
CommonKeyDict = commonKeys.ToDictionary(k => k.Name, k => k);
UniqueKeyDict = uniqueKeys.ToDictionary(k => k.Name, k => k);
AllKeyDict = uniqueKeys.Concat(commonKeys).ToDictionary(k => k.Name, k => k);
}
public static Keyset ReadKeyFile(string filename, string titleKeysFilename = null, string consoleKeysFilename = null, IProgressReport progress = null) public static Keyset ReadKeyFile(string filename, string titleKeysFilename = null, string consoleKeysFilename = null, IProgressReport progress = null)
{ {
var keyset = new Keyset(); var keyset = new Keyset();
if (filename != null) ReadMainKeys(keyset, filename, CommonKeyDict, progress); if (filename != null) ReadMainKeys(keyset, filename, AllKeyDict, progress);
if (consoleKeysFilename != null) ReadMainKeys(keyset, consoleKeysFilename, UniqueKeyDict, progress); if (consoleKeysFilename != null) ReadMainKeys(keyset, consoleKeysFilename, AllKeyDict, progress);
if (titleKeysFilename != null) ReadTitleKeys(keyset, titleKeysFilename, progress); if (titleKeysFilename != null) ReadTitleKeys(keyset, titleKeysFilename, progress);
keyset.DeriveKeys(); keyset.DeriveKeys();
@ -219,7 +230,7 @@ namespace libhac
return sb.ToString(); return sb.ToString();
} }
private static Dictionary<string, KeyValue> CreateCommonKeyDict() private static List<KeyValue> CreateCommonKeyList()
{ {
var keys = new List<KeyValue> var keys = new List<KeyValue>
{ {
@ -260,10 +271,10 @@ namespace libhac
keys.Add(new KeyValue($"key_area_key_system_{i:x2}", 0x10, set => set.key_area_keys[i][2])); keys.Add(new KeyValue($"key_area_key_system_{i:x2}", 0x10, set => set.key_area_keys[i][2]));
} }
return keys.ToDictionary(k => k.Name, k => k); return keys;
} }
private static Dictionary<string, KeyValue> CreateUniqueKeyDict() private static List<KeyValue> CreateUniqueKeyList()
{ {
var keys = new List<KeyValue> var keys = new List<KeyValue>
{ {
@ -279,7 +290,7 @@ namespace libhac
keys.Add(new KeyValue($"bis_key_{i:x2}", 0x20, set => set.bis_keys[i])); keys.Add(new KeyValue($"bis_key_{i:x2}", 0x20, set => set.bis_keys[i]));
} }
return keys.ToDictionary(k => k.Name, k => k); return keys;
} }
private class KeyValue private class KeyValue