keys/nca: add new keydata for HOS 18.0.0.

.github/workflows/rewrite.yml

@@ -22,14 +22,6 @@ jobs:
     container:
       image: devkitpro/devkita64
     steps:
-      # Workaround: avoid requesting data from devkitPro servers because they ban most CI/CD scripts.
-      # TODO: completely remove this step after the devkitA64 Docker image gets updated, since it should contain the NTFS-3G and lwext4 portlibs.
-      - name: Update packages
-        run: |
-          sudo -n dkp-pacman --noconfirm -U \
-            "https://wii.leseratte10.de/devkitPro/switch/switch-ntfs-3g-2022.10.3-4-any.pkg.tar.zst" \
-            "https://wii.leseratte10.de/devkitPro/switch/switch-lwext4-1.0.0-1-any.pkg.tar.zst"
-
       - uses: actions/checkout@v4
         with:
           path: nxdumptool

include/core/key_sources.h

@@ -55,6 +55,7 @@ static const u8 g_masterKeyVectorsProd[NcaKeyGeneration_Current][AES_128_KEY_SIZ
     { 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.
 };
 
 /* Used to derive all previous master keys using the latest master key on development units. */
@@ -77,24 +78,25 @@ static const u8 g_masterKeyVectorsDev[NcaKeyGeneration_Current][AES_128_KEY_SIZE
     { 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.
 };
 
 /* Used to derive a master KEK using the TSEC root key on Erista units. */
 /* TODO: update on master key changes. */
 static const u8 g_eristaMasterKekSource[AES_128_KEY_SIZE] = {
-    0x71, 0xB9, 0xA6, 0xC0, 0xFF, 0x97, 0x6B, 0x0C, 0xB4, 0x40, 0xB9, 0xD5, 0x81, 0x5D, 0x81, 0x90
+    0x00, 0x04, 0x5D, 0xF0, 0x4D, 0xCD, 0x14, 0xA3, 0x1C, 0xBF, 0xDE, 0x48, 0x55, 0xBA, 0x35, 0xC1
 };
 
 /* Used to derive a master KEK on retail Mariko units. */
 /* TODO: update on master key changes. */
 static const u8 g_marikoMasterKekSourceProd[AES_128_KEY_SIZE] = {
-    0x8D, 0xEE, 0x9E, 0x11, 0x36, 0x3A, 0x9B, 0x0A, 0x6A, 0xC7, 0xBB, 0xE9, 0xD1, 0x03, 0xF7, 0x80
+    0x4F, 0x41, 0x3C, 0x3B, 0xFB, 0x6A, 0x01, 0x2A, 0x68, 0x9F, 0x83, 0xE9, 0x53, 0xBD, 0x16, 0xD2
 };
 
 /* Used to derive a master KEK on development Mariko units. */
 /* TODO: update on master key changes. */
 static const u8 g_marikoMasterKekSourceDev[AES_128_KEY_SIZE] = {
-    0x43, 0xDB, 0x9D, 0x88, 0xDB, 0x38, 0xE9, 0xBF, 0x3D, 0xD7, 0x83, 0x39, 0xEF, 0xB1, 0x4F, 0xA7
+    0xE4, 0x45, 0xD0, 0x14, 0xA0, 0xE5, 0xE9, 0x4B, 0xFE, 0x76, 0xF4, 0x29, 0x41, 0xBB, 0x64, 0xED
 };
 
 /* Used to derive master keys from master KEKs. Found in TrustZone / Secure Monitor. */

include/core/nca.h

@@ -95,8 +95,9 @@ typedef enum {
     NcaKeyGeneration_Since1400NUP = 14,                             ///< 14.0.0 - 14.1.2.
     NcaKeyGeneration_Since1500NUP = 15,                             ///< 15.0.0 - 15.0.1.
     NcaKeyGeneration_Since1600NUP = 16,                             ///< 16.0.0 - 16.1.0.
-    NcaKeyGeneration_Since1700NUP = 17,                             ///< 17.0.0+.
+    NcaKeyGeneration_Since1700NUP = 17,                             ///< 17.0.0 - 17.0.1.
-    NcaKeyGeneration_Current      = NcaKeyGeneration_Since1700NUP,
+    NcaKeyGeneration_Since1800NUP = 18,                             ///< 18.0.0+.
+    NcaKeyGeneration_Current      = NcaKeyGeneration_Since1800NUP,
     NcaKeyGeneration_Max          = 32
 } NcaKeyGeneration;
 

source/core/keys.c

@@ -659,7 +659,7 @@ static bool keysReadKeysFromFile(void)
 static bool keysDeriveMasterKeys(void)
 {
     u8 tmp[AES_128_KEY_SIZE] = {0};
-    u8 latest_mkey_index = (NcaKeyGeneration_Current - 1);
+    const u8 latest_mkey_index = (NcaKeyGeneration_Current - 1);
     bool is_dev = utilsIsDevelopmentUnit();
 
     /* Only derive the latest master key if it hasn't been populated already. */