From d23411f203e051130cccb37a6e9cc6184d0df43f Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 21 May 2024 00:29:15 -0700 Subject: [PATCH] Add key sources for 18.0.0 --- build/CodeGen/IncludedKeys.txt | 3 +++ src/LibHac/Common/Keys/KeyDerivation.cs | 2 ++ src/LibHac/Common/Utilities.cs | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/CodeGen/IncludedKeys.txt b/build/CodeGen/IncludedKeys.txt index f01d372f..822f5084 100644 --- a/build/CodeGen/IncludedKeys.txt +++ b/build/CodeGen/IncludedKeys.txt @@ -21,6 +21,7 @@ master_kek_source_0d = F013379AD56351C3B49635BC9CE87681 master_kek_source_0e = 6E7786AC830A8D3E7DB766A022B76E67 master_kek_source_0f = 99220957A7F95E94FE787F41D6E756E6 master_kek_source_10 = 71B9A6C0FF976B0CB440B9D5815D8190 +master_kek_source_11 = 00045DF04DCD14A31CBFDE4855BA35C1 mariko_master_kek_source_05 = 77605AD2EE6EF83C3F72E2599DAC5E56 mariko_master_kek_source_06 = 1E80B8173EC060AA11BE1A4AA66FE4AE @@ -34,6 +35,7 @@ mariko_master_kek_source_0d = D268C6539D94F9A8A5A8A7C88F534B7A mariko_master_kek_source_0e = EC61BC821E0F5AC32B643F9DD619222D mariko_master_kek_source_0f = A5EC16391A3016082ECF096F5E7CEEA9 mariko_master_kek_source_10 = 8DEE9E11363A9B0A6AC7BBE9D103F780 +mariko_master_kek_source_11 = 4F413C3BFB6A012A689F83E953BD16D2 mariko_master_kek_source_dev_05 = 32C0976B636D4464F23AA5C0DE46CCE9 mariko_master_kek_source_dev_06 = CC974C462A0CB0A6C9C0B7BE302EC368 @@ -47,6 +49,7 @@ mariko_master_kek_source_dev_0d = EC5EB511D5431E6A4E546FD4D322CE87 mariko_master_kek_source_dev_0e = 18A56FEF721162C51A14F18C218327B7 mariko_master_kek_source_dev_0f = 3A9CF0397023F6AF714460F46DEDA1D6 mariko_master_kek_source_dev_10 = 43DB9D88DB38E9BF3DD78339EFB14FA7 +mariko_master_kek_source_dev_11 = E445D014A0E5E94BFE76F42941BB64ED master_key_source = D8A2410AC6C59001C61D6A267C513F3C diff --git a/src/LibHac/Common/Keys/KeyDerivation.cs b/src/LibHac/Common/Keys/KeyDerivation.cs index 4785d715..81c4a626 100644 --- a/src/LibHac/Common/Keys/KeyDerivation.cs +++ b/src/LibHac/Common/Keys/KeyDerivation.cs @@ -311,6 +311,7 @@ internal static class KeyDerivation 0xD6, 0x80, 0x98, 0xC0, 0xFA, 0xC7, 0x13, 0xCB, 0x93, 0xD2, 0x0B, 0x82, 0x4C, 0xA1, 0x7B, 0x8D, // Master key 0D encrypted with Master key 0E. 0x78, 0x66, 0x19, 0xBD, 0x86, 0xE7, 0xC1, 0x09, 0x9B, 0x6F, 0x92, 0xB2, 0x58, 0x7D, 0xCF, 0x26, // Master key 0E encrypted with Master key 0F. 0x39, 0x1E, 0x7E, 0xF8, 0x7E, 0x73, 0xEA, 0x6F, 0xAF, 0x00, 0x3A, 0xB4, 0xAA, 0xB8, 0xB7, 0x59, // Master key 0F encrypted with Master key 10. + 0x0C, 0x75, 0x39, 0x15, 0x53, 0xEA, 0x81, 0x11, 0xA3, 0xE0, 0xDC, 0x3D, 0x0E, 0x76, 0xC6, 0xB8, // Master key 10 encrypted with Master key 11. ]; private static ReadOnlySpan MasterKeyVectorsProd => @@ -332,6 +333,7 @@ internal static class KeyDerivation 0xB1, 0x81, 0xA6, 0x0D, 0x72, 0xC7, 0xEE, 0x15, 0x21, 0xF3, 0xC0, 0xB5, 0x6B, 0x61, 0x6D, 0xE7, // Master key 0D encrypted with Master key 0E. 0xAF, 0x11, 0x4C, 0x67, 0x17, 0x7A, 0x52, 0x43, 0xF7, 0x70, 0x2F, 0xC7, 0xEF, 0x81, 0x72, 0x16, // Master key 0E encrypted with Master key 0F. 0x25, 0x12, 0x8B, 0xCB, 0xB5, 0x46, 0xA1, 0xF8, 0xE0, 0x52, 0x15, 0xB7, 0x0B, 0x57, 0x00, 0xBD, // Master key 0F encrypted with Master key 10. + 0x58, 0x15, 0xD2, 0xF6, 0x8A, 0xE8, 0x19, 0xAB, 0xFB, 0x2D, 0x52, 0x9D, 0xE7, 0x55, 0xF3, 0x93, // Master key 10 encrypted with Master key 11. ]; private static void DerivePerConsoleKeys(KeySet s) diff --git a/src/LibHac/Common/Utilities.cs b/src/LibHac/Common/Utilities.cs index e941ec8b..d2b3d0ff 100644 --- a/src/LibHac/Common/Utilities.cs +++ b/src/LibHac/Common/Utilities.cs @@ -295,7 +295,8 @@ public static class Utilities 0xD => "14.0.0-14.1.2", 0xE => "15.0.0-15.0.1", 0xF => "16.0.0-16.1.0", - 0x10 => "17.0.0-", + 0x10 => "17.0.0-17.0.1", + 0x11 => "18.0.0-", _ => "Unknown" };