diff --git a/build/CodeGen/IncludedKeys.txt b/build/CodeGen/IncludedKeys.txt index c766b17b..69d65cbc 100644 --- a/build/CodeGen/IncludedKeys.txt +++ b/build/CodeGen/IncludedKeys.txt @@ -13,6 +13,7 @@ master_kek_source_09 = 1AEC11822B32387A2BEDBA01477E3B67 master_kek_source_0a = 303F027ED838ECD7932534B530EBCA7A master_kek_source_0b = 8467B67F1311AEE6589B19AF136C807A master_kek_source_0c = 683BCA54B86F9248C305768788707923 +master_kek_source_0d = F013379AD56351C3B49635BC9CE87681 mariko_master_kek_source_05 = 77605AD2EE6EF83C3F72E2599DAC5E56 mariko_master_kek_source_06 = 1E80B8173EC060AA11BE1A4AA66FE4AE @@ -22,6 +23,7 @@ mariko_master_kek_source_09 = 8669F00987C805AEB57B4874DE62A613 mariko_master_kek_source_0a = 0E440CEDB436C03FAA1DAEBF62B10982 mariko_master_kek_source_0b = E541ACECD1A7D1ABED0377F127CAF8F1 mariko_master_kek_source_0c = 52719BDFA78B61D8D58511E48E4F74C6 +mariko_master_kek_source_0d = D268C6539D94F9A8A5A8A7C88F534B7A mariko_master_kek_source_dev_05 = 32C0976B636D4464F23AA5C0DE46CCE9 mariko_master_kek_source_dev_06 = CC974C462A0CB0A6C9C0B7BE302EC368 @@ -31,6 +33,7 @@ mariko_master_kek_source_dev_09 = 82729165403B9D6660D01B3D4DA570E1 mariko_master_kek_source_dev_0a = F937CF9ABD86BBA99C9E03C4FCBC3BCE mariko_master_kek_source_dev_0b = 752D2EF32F3FFE65F4A983B4ED4263BA mariko_master_kek_source_dev_0c = 4D5AB2C9E9E44EA4D3BF94123630D07F +mariko_master_kek_source_dev_0d = EC5EB511D5431E6A4E546FD4D322CE87 master_key_source = D8A2410AC6C59001C61D6A267C513F3C diff --git a/src/LibHac/Common/Keys/KeyDerivation.cs b/src/LibHac/Common/Keys/KeyDerivation.cs index 407ffe24..e5ccefc2 100644 --- a/src/LibHac/Common/Keys/KeyDerivation.cs +++ b/src/LibHac/Common/Keys/KeyDerivation.cs @@ -219,6 +219,7 @@ internal static class KeyDerivation 0x6C, 0x2E, 0xCD, 0xB3, 0x34, 0x61, 0x77, 0xF5, 0xF9, 0xB1, 0xDD, 0x61, 0x98, 0x19, 0x3E, 0xD4, // Master key 09 encrypted with Master key 0A. 0x21, 0x88, 0x6B, 0x10, 0x9E, 0x83, 0xD6, 0x52, 0xAB, 0x08, 0xDB, 0x6D, 0x39, 0xFF, 0x1C, 0x9C, // Master key 0A encrypted with Master key 0B. 0x8A, 0xCE, 0xC4, 0x7F, 0xBE, 0x08, 0x61, 0x88, 0xD3, 0x73, 0x64, 0x51, 0xE2, 0xB6, 0x53, 0x15, // Master key 0B encrypted with Master key 0C. + 0x08, 0xE0, 0xF4, 0xBE, 0xAA, 0x6E, 0x5A, 0xC3, 0xA6, 0xBC, 0xFE, 0xB9, 0xE2, 0xA3, 0x24, 0x12, // Master key 0C encrypted with Master key 0D. }; private static ReadOnlySpan MasterKeyVectorsProd => new byte[] @@ -236,6 +237,7 @@ internal static class KeyDerivation 0xB8, 0x96, 0x9E, 0x4A, 0x00, 0x0D, 0xD6, 0x28, 0xB3, 0xD1, 0xDB, 0x68, 0x5F, 0xFB, 0xE1, 0x2A, // Master key 09 encrypted with Master key 0A. 0xC1, 0x8D, 0x16, 0xBB, 0x2A, 0xE4, 0x1D, 0xD4, 0xC2, 0xC1, 0xB6, 0x40, 0x94, 0x35, 0x63, 0x98, // Master key 0A encrypted with Master key 0B. 0xA3, 0x24, 0x65, 0x75, 0xEA, 0xCC, 0x6E, 0x8D, 0xFB, 0x5A, 0x16, 0x50, 0x74, 0xD2, 0x15, 0x06, // Master key 0B encrypted with Master key 0C. + 0x83, 0x67, 0xAF, 0x01, 0xCF, 0x93, 0xA1, 0xAB, 0x80, 0x45, 0xF7, 0x3F, 0x72, 0xFD, 0x3B, 0x38, // Master key 0C encrypted with Master key 0D. }; private static void DerivePerConsoleKeys(KeySet s) diff --git a/src/LibHac/Common/Utilities.cs b/src/LibHac/Common/Utilities.cs index 98530ca5..145b8ee0 100644 --- a/src/LibHac/Common/Utilities.cs +++ b/src/LibHac/Common/Utilities.cs @@ -290,7 +290,8 @@ public static class Utilities 9 => "9.0.0-9.0.1", 0xA => "9.1.0-12.0.3", 0xB => "12.1.0", - 0xC => "13.0.0-", + 0xC => "13.0.0-13.2.1", + 0xD => "14.0.0-", _ => "Unknown" };