From 52709d5f7a24477a078ee9e3be53fdbfed84b6a7 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Thu, 10 Sep 2026 12:11:16 +0300 Subject: [PATCH 1/2] hos: add 23.0.0 support --- bootloader/hos/hos.c | 2 + bootloader/hos/hos.h | 3 +- bootloader/hos/pkg1.c | 5 +- bootloader/hos/pkg2_patches.inl | 26 ++++++++ bootloader/hos/secmon_exo.c | 2 +- nyx/nyx_gui/frontend/gui_info.c | 107 +++++++++----------------------- nyx/nyx_gui/hos/hos.c | 8 ++- nyx/nyx_gui/hos/hos.h | 5 +- nyx/nyx_gui/hos/pkg1.c | 5 +- nyx/nyx_gui/hos/pkg2.c | 2 + 10 files changed, 76 insertions(+), 89 deletions(-) diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c index c7344898..0b2ad5bc 100644 --- a/bootloader/hos/hos.c +++ b/bootloader/hos/hos.c @@ -73,6 +73,7 @@ static const u8 master_kekseed_t210_tsec_v4[HOS_MKEY_VER_MAX - HOS_MKEY_VER_810 { 0xA1, 0x7D, 0x34, 0xDB, 0x2D, 0x9D, 0xDA, 0xE5, 0xF8, 0x15, 0x63, 0x4C, 0x8F, 0xE7, 0x6C, 0xD8 }, // 20.0.0. { 0x66, 0xC8, 0xCB, 0x3D, 0xEC, 0xF4, 0x59, 0x73, 0x54, 0x88, 0xE1, 0x2E, 0xE6, 0x3D, 0x68, 0x46 }, // 21.0.0. { 0x15, 0xAC, 0x96, 0x34, 0xF5, 0x32, 0x56, 0x68, 0xFE, 0x5B, 0x9D, 0xD7, 0xED, 0x19, 0xB7, 0x8E }, // 22.0.0. + { 0x92, 0xC8, 0x9C, 0x8A, 0x58, 0xE6, 0xE7, 0xB6, 0xE4, 0x27, 0xE2, 0x31, 0xEF, 0x4B, 0xD8, 0x82 }, // 23.0.0. }; //!TODO: Update on mkey changes. @@ -94,6 +95,7 @@ static const u8 master_kekseed_t210b01[HOS_MKEY_VER_MAX - HOS_MKEY_VER_600 + 1][ { 0x1A, 0x31, 0x62, 0x87, 0xA8, 0x09, 0xCA, 0xF8, 0x69, 0x15, 0x45, 0xC2, 0x6B, 0xAA, 0x5A, 0x8A }, // 20.0.0. { 0xEB, 0xF3, 0x5B, 0x2D, 0x4A, 0x2D, 0xCE, 0x45, 0x3A, 0x6F, 0x61, 0x38, 0x0B, 0x00, 0x3B, 0x46 }, // 21.0.0. { 0x82, 0xE2, 0x0A, 0x59, 0x67, 0xDF, 0xBF, 0x51, 0x47, 0x62, 0x11, 0xF2, 0x41, 0xD3, 0xEE, 0x13 }, // 22.0.0. + { 0x08, 0x11, 0xF7, 0xE8, 0x76, 0x9E, 0xA3, 0xD5, 0x3A, 0x3D, 0x7A, 0x68, 0x1A, 0x24, 0x2A, 0x99 }, // 23.0.0. }; static const u8 console_keyseed[SE_KEY_128_SIZE] = diff --git a/bootloader/hos/hos.h b/bootloader/hos/hos.h index a9ab15d7..bcae66fb 100644 --- a/bootloader/hos/hos.h +++ b/bootloader/hos/hos.h @@ -49,7 +49,8 @@ enum { HOS_MKEY_VER_2000 = 19, HOS_MKEY_VER_2100 = 20, HOS_MKEY_VER_2200 = 21, - HOS_MKEY_VER_MAX = HOS_MKEY_VER_2200 + HOS_MKEY_VER_2300 = 22, + HOS_MKEY_VER_MAX = HOS_MKEY_VER_2300 }; #define HOS_TSEC_VERSION 4 //! TODO: Update on TSEC Root Key changes. diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c index 9b1c8c93..cefb31ef 100644 --- a/bootloader/hos/pkg1.c +++ b/bootloader/hos/pkg1.c @@ -141,7 +141,7 @@ static const u8 sec_map_100[3] = { PK11_SECTION_SM, PK11_SECTION_LD, PK11_SECTIO static const u8 sec_map_2xx[3] = { PK11_SECTION_WB, PK11_SECTION_LD, PK11_SECTION_SM }; static const u8 sec_map_4xx[3] = { PK11_SECTION_LD, PK11_SECTION_SM, PK11_SECTION_WB }; - // Timestamp MK FU TSEC PK11 SECMON Warmboot +// Timestamp MK FU TSEC PK11 SECMON Warmboot static const pkg1_id_t _pkg1_ids[] = { { "20161121", 0, 1, 0x1900, 0x3FE0, SM_100_ADR, 0x8000D000, _secmon_1_patchset }, // 1.0.0 (Patched relocator). { "20170210", 0, 2, 0x1900, 0x3FE0, 0x4002D000, 0x8000D000, _secmon_2_patchset }, // 2.0.0 - 2.3.0. @@ -172,7 +172,8 @@ static const pkg1_id_t _pkg1_ids[] = { { "20240808", 18, 20, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL }, // 19.0.0 - 19.0.1. { "20250206", 19, 21, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL }, // 20.0.0 - 20.5.0. { "20251009", 20, 22, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL }, // 21.0.0 - 21.2.0. - { "20260123", 21, 23, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL }, // 22.0.0+ + { "20260123", 21, 23, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL }, // 22.0.0 - 22.5.0. + { "20260730", 22, 24, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000, NULL }, // 23.0.0+ }; const pkg1_id_t *pkg1_get_latest() diff --git a/bootloader/hos/pkg2_patches.inl b/bootloader/hos/pkg2_patches.inl index 6e331659..62f2e30c 100644 --- a/bootloader/hos/pkg2_patches.inl +++ b/bootloader/hos/pkg2_patches.inl @@ -893,6 +893,30 @@ static const kip1_patchset_t _fs_patches_2200_exfat[] = { { NULL, NULL } }; +static const kip1_patch_t _fs_nogc_2300[] = { + { KPS(KIP_TEXT) | 0x186240, 8, KIP1_PATCH_SRC_NO_CHECK, KIP1_FS_NOGC_PATCH_NOINIT }, + { KPS(KIP_TEXT) | 0x1B35BD, 1, KIP1_PATCH_SRC_NO_CHECK, KIP1_FS_NOGC_PATCH_SDMMC3 }, + { KPS(KIP_TEXT) | 0x1B35D5, 1, KIP1_PATCH_SRC_NO_CHECK, KIP1_FS_NOGC_PATCH_SDMMC3 }, + { 0, 0, NULL, NULL } +}; + +static const kip1_patchset_t _fs_patches_2300[] = { + { "nogc", _fs_nogc_2300 }, + { NULL, NULL } +}; + +static const kip1_patch_t _fs_nogc_2300_exfat[] = { + { KPS(KIP_TEXT) | 0x191440, 8, KIP1_PATCH_SRC_NO_CHECK, KIP1_FS_NOGC_PATCH_NOINIT }, + { KPS(KIP_TEXT) | 0x1BE7BD, 1, KIP1_PATCH_SRC_NO_CHECK, KIP1_FS_NOGC_PATCH_SDMMC3 }, + { KPS(KIP_TEXT) | 0x1BE7D5, 1, KIP1_PATCH_SRC_NO_CHECK, KIP1_FS_NOGC_PATCH_SDMMC3 }, + { 0, 0, NULL, NULL } +}; + +static const kip1_patchset_t _fs_patches_2300_exfat[] = { + { "nogc", _fs_nogc_2300_exfat }, + { NULL, NULL } +}; + // SHA256 hashes. static const kip1_id_t _kip_ids[] = { @@ -970,4 +994,6 @@ static const kip1_id_t _kip_ids[] = { "FS", "\xFB\x0B\x68\xDB\x24\x03\xD1\x19", _fs_patches_2200_exfat }, // FS 22.0.0 exFAT { "FS", "\x53\x6D\x93\x84\x69\xFE\x73\xBE", _fs_patches_2200 }, // FS 22.5.0 { "FS", "\xD4\x45\x28\x29\x5B\x41\x92\xBA", _fs_patches_2200_exfat }, // FS 22.5.0 exFAT + { "FS", "\x34\x38\x3E\xE7\x99\x92\x63\x40", _fs_patches_2300 }, // FS 23.0.0 + { "FS", "\xFD\xAF\x16\x32\x88\xE1\x08\x05", _fs_patches_2300_exfat }, // FS 23.0.0 exFAT }; diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c index 2176c3fd..7ce1a5f9 100644 --- a/bootloader/hos/secmon_exo.c +++ b/bootloader/hos/secmon_exo.c @@ -199,7 +199,7 @@ void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base) case 12: exo_fw_no = EXO_FW_VER(9, 1); break; - case 13 ... 25: //!TODO: Update on API changes. 25: 22.0.0. + case 13 ... 26: //!TODO: Update on API changes. 26: 23.0.0. exo_fw_no = EXO_FW_VER(exo_fw_no - 3, ctxt->exo_ctx.hos_revision); break; } diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index 2099e13c..865644d2 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -735,89 +735,38 @@ static lv_res_t _create_window_hw_info_status(lv_obj_t *btn) u8 burnt_fuses_6 = bit_count(fuse_read_odm(6)); // Check if overburnt. - u8 burnt_fuses_hos = (fuse_read_odm(7) & ~bit_count_mask(burnt_fuses_7)) ? 255 : burnt_fuses_7; + u8 burnt_fuses_hos = (fuse_read_odm(7) & ~bit_count_mask(burnt_fuses_7)) ? 64 : burnt_fuses_7; //! TODO: Update on anti-downgrade fuses change. switch (burnt_fuses_hos) { - case 0: - strcpy(fuses_hos_version, "#96FF00 Golden sample#"); - break; - case 1: - strcpy(fuses_hos_version, "1.0.0"); - break; - case 2: - strcpy(fuses_hos_version, "2.0.0 - 2.3.0"); - break; - case 3: - strcpy(fuses_hos_version, "3.0.0"); - break; - case 4: - strcpy(fuses_hos_version, "3.0.1 - 3.0.2"); - break; - case 5: - strcpy(fuses_hos_version, "4.0.0 - 4.1.0"); - break; - case 6: - strcpy(fuses_hos_version, "5.0.0 - 5.1.0"); - break; - case 7: - strcpy(fuses_hos_version, "6.0.0 - 6.1.0"); - break; - case 8: - strcpy(fuses_hos_version, "6.2.0"); - break; - case 9: - strcpy(fuses_hos_version, "7.0.0 - 8.0.1"); - break; - case 10: - strcpy(fuses_hos_version, "8.1.0 - 8.1.1"); - break; - case 11: - strcpy(fuses_hos_version, "9.0.0 - 9.0.1"); - break; - case 12: - strcpy(fuses_hos_version, "9.1.0 - 9.2.0"); - break; - case 13: - strcpy(fuses_hos_version, "10.0.0 - 10.2.0"); - break; - case 14: - strcpy(fuses_hos_version, "11.0.0 - 12.0.1"); - break; - case 15: - strcpy(fuses_hos_version, "12.0.2 - 13.2.0"); - break; - case 16: - strcpy(fuses_hos_version, "13.2.1 - 14.1.2"); - break; - case 17: - strcpy(fuses_hos_version, "15.0.0 - 15.0.1"); - break; - case 18: - strcpy(fuses_hos_version, "16.0.0 - 16.1.0"); - break; - case 19: - strcpy(fuses_hos_version, "17.0.0 - 18.1.0"); - break; - case 20: - strcpy(fuses_hos_version, "19.0.0 - 19.0.1"); - break; - case 21: - strcpy(fuses_hos_version, "20.0.0 - 20.5.0"); - break; - case 22: - strcpy(fuses_hos_version, "21.0.0 - 21.2.0"); - break; - case 23: - strcpy(fuses_hos_version, "22.0.0+"); - break; - case 255: - strcpy(fuses_hos_version, "#FFD000 Overburnt#"); - break; - default: - strcpy(fuses_hos_version, "#FF8000 Unknown#"); - break; + case 0: strcpy(fuses_hos_version, "#96FF00 Golden#"); break; + case 1: strcpy(fuses_hos_version, "1.0.0"); break; + case 2: strcpy(fuses_hos_version, "2.0.0 - 2.3.0"); break; + case 3: strcpy(fuses_hos_version, "3.0.0"); break; + case 4: strcpy(fuses_hos_version, "3.0.1 - 3.0.2"); break; + case 5: strcpy(fuses_hos_version, "4.0.0 - 4.1.0"); break; + case 6: strcpy(fuses_hos_version, "5.0.0 - 5.1.0"); break; + case 7: strcpy(fuses_hos_version, "6.0.0 - 6.1.0"); break; + case 8: strcpy(fuses_hos_version, "6.2.0"); break; + case 9: strcpy(fuses_hos_version, "7.0.0 - 8.0.1"); break; + case 10: strcpy(fuses_hos_version, "8.1.0 - 8.1.1"); break; + case 11: strcpy(fuses_hos_version, "9.0.0 - 9.0.1"); break; + case 12: strcpy(fuses_hos_version, "9.1.0 - 9.2.0"); break; + case 13: strcpy(fuses_hos_version, "10.0.0 - 10.2.0"); break; + case 14: strcpy(fuses_hos_version, "11.0.0 - 12.0.1"); break; + case 15: strcpy(fuses_hos_version, "12.0.2 - 13.2.0"); break; + case 16: strcpy(fuses_hos_version, "13.2.1 - 14.1.2"); break; + case 17: strcpy(fuses_hos_version, "15.0.0 - 15.0.1"); break; + case 18: strcpy(fuses_hos_version, "16.0.0 - 16.1.0"); break; + case 19: strcpy(fuses_hos_version, "17.0.0 - 18.1.0"); break; + case 20: strcpy(fuses_hos_version, "19.0.0 - 19.0.1"); break; + case 21: strcpy(fuses_hos_version, "20.0.0 - 20.5.0"); break; + case 22: strcpy(fuses_hos_version, "21.0.0 - 21.2.0"); break; + case 23: strcpy(fuses_hos_version, "22.0.0 - 22.5.0"); break; + case 24: strcpy(fuses_hos_version, "23.0.0+"); break; + case 64: strcpy(fuses_hos_version, "#FFD000 Overburnt#"); break; + default: strcpy(fuses_hos_version, "#FF8000 Unknown#"); break; } u32 fab = FUSE(FUSE_OPT_FAB_CODE); diff --git a/nyx/nyx_gui/hos/hos.c b/nyx/nyx_gui/hos/hos.c index 6e826143..cf858db0 100644 --- a/nyx/nyx_gui/hos/hos.c +++ b/nyx/nyx_gui/hos/hos.c @@ -2,7 +2,7 @@ * Copyright (c) 2018 naehrwert * Copyright (c) 2018 st4rk * Copyright (c) 2018 Ced2911 - * Copyright (c) 2018-2025 CTCaer + * Copyright (c) 2018-2026 CTCaer * Copyright (c) 2018 balika011 * * This program is free software; you can redistribute it and/or modify it @@ -51,7 +51,7 @@ static const u8 master_kekseed_620[SE_KEY_128_SIZE] = //!TODO: Update on mkey changes. static const u8 master_kekseed_t210_max[SE_KEY_128_SIZE] = - { 0x15, 0xAC, 0x96, 0x34, 0xF5, 0x32, 0x56, 0x68, 0xFE, 0x5B, 0x9D, 0xD7, 0xED, 0x19, 0xB7, 0x8E }; // 22.0.0. + { 0x92, 0xC8, 0x9C, 0x8A, 0x58, 0xE6, 0xE7, 0xB6, 0xE4, 0x27, 0xE2, 0x31, 0xEF, 0x4B, 0xD8, 0x82 }; // 23.0.0. //!TODO: Update on mkey changes. static const u8 master_kekseed_t210b01[HOS_MKEY_VER_MAX - HOS_MKEY_VER_600 + 1][SE_KEY_128_SIZE] = { @@ -72,6 +72,7 @@ static const u8 master_kekseed_t210b01[HOS_MKEY_VER_MAX - HOS_MKEY_VER_600 + 1][ { 0x1A, 0x31, 0x62, 0x87, 0xA8, 0x09, 0xCA, 0xF8, 0x69, 0x15, 0x45, 0xC2, 0x6B, 0xAA, 0x5A, 0x8A }, // 20.0.0. { 0xEB, 0xF3, 0x5B, 0x2D, 0x4A, 0x2D, 0xCE, 0x45, 0x3A, 0x6F, 0x61, 0x38, 0x0B, 0x00, 0x3B, 0x46 }, // 21.0.0. { 0x82, 0xE2, 0x0A, 0x59, 0x67, 0xDF, 0xBF, 0x51, 0x47, 0x62, 0x11, 0xF2, 0x41, 0xD3, 0xEE, 0x13 }, // 22.0.0. + { 0x08, 0x11, 0xF7, 0xE8, 0x76, 0x9E, 0xA3, 0xD5, 0x3A, 0x3D, 0x7A, 0x68, 0x1A, 0x24, 0x2A, 0x99 }, // 23.0.0. }; static const u8 console_keyseed[SE_KEY_128_SIZE] = @@ -107,6 +108,7 @@ static const u8 mkey_vectors[HOS_MKEY_VER_MAX + 1][SE_KEY_128_SIZE] = { { 0x97, 0xE4, 0x11, 0xAB, 0x22, 0x72, 0x1A, 0x1F, 0x70, 0x5C, 0x00, 0xB3, 0x96, 0x30, 0x05, 0x28 }, // Mkey 18 encrypted with mkey 19. { 0xF7, 0x92, 0xC0, 0xEC, 0xF3, 0xA4, 0x8C, 0xB7, 0x0D, 0xB3, 0xF3, 0xAB, 0x10, 0x9B, 0x18, 0xBA }, // Mkey 19 encrypted with mkey 20. { 0x14, 0xCB, 0x60, 0x29, 0x3D, 0xE0, 0xFB, 0xF2, 0x5B, 0x60, 0xB6, 0xC5, 0x2E, 0x77, 0x8F, 0x98 }, // Mkey 20 encrypted with mkey 21. + { 0x26, 0x87, 0xDF, 0x21, 0x44, 0xD4, 0x5F, 0x4E, 0x61, 0x03, 0x9E, 0xF3, 0x40, 0x04, 0xC3, 0x87 }, // Mkey 21 encrypted with mkey 22. }; //!TODO: Update on mkey changes. @@ -130,6 +132,7 @@ static const u8 new_console_keyseed[HOS_MKEY_VER_MAX - HOS_MKEY_VER_400 + 1][SE_ { 0xA3, 0x6B, 0x0A, 0xB5, 0x6F, 0x57, 0x4C, 0x5E, 0x00, 0xFD, 0x56, 0x21, 0xF5, 0x06, 0x6B, 0xD1 }, // 20.0.0 New Device Key Source. { 0xF9, 0x62, 0x05, 0x99, 0xE0, 0xB9, 0xA6, 0x9B, 0x9D, 0xAA, 0xB4, 0x12, 0x0B, 0x0F, 0xF5, 0x8F }, // 21.0.0 New Device Key Source. { 0xF8, 0xF4, 0x22, 0xA4, 0x34, 0xAE, 0x0E, 0x0C, 0x4D, 0x5C, 0x5B, 0xA1, 0x1B, 0x46, 0x1C, 0x78 }, // 22.0.0 New Device Key Source. + { 0x95, 0xC1, 0xAC, 0xB7, 0xB2, 0xCA, 0x9B, 0x8C, 0xD5, 0xEA, 0x40, 0xD9, 0x9C, 0xD2, 0x7C, 0x47 }, // 23.0.0 New Device Key Source. }; //!TODO: Update on mkey changes. @@ -153,6 +156,7 @@ static const u8 new_console_kekseed[HOS_MKEY_VER_MAX - HOS_MKEY_VER_400 + 1][SE_ { 0xDA, 0xFB, 0x61, 0x39, 0x48, 0x2D, 0xC2, 0x7E, 0x0D, 0x8E, 0x8F, 0x98, 0x57, 0x20, 0xB8, 0x15 }, // 20.0.0 New Device Keygen Source. { 0x92, 0xBF, 0x37, 0x80, 0x0E, 0x79, 0x56, 0x8C, 0x57, 0x75, 0x72, 0x0A, 0x48, 0xD8, 0x15, 0x39 }, // 21.0.0 New Device Keygen Source. { 0xC4, 0x6F, 0x0E, 0x72, 0x43, 0xCE, 0x87, 0xFC, 0x38, 0x95, 0x9B, 0xC9, 0x31, 0x44, 0x97, 0x63 }, // 22.0.0 New Device Keygen Source. + { 0xA0, 0xC8, 0x44, 0x39, 0x8A, 0x1F, 0xD8, 0x6A, 0x3D, 0x0A, 0x23, 0xFF, 0x43, 0xA6, 0x95, 0x80 }, // 23.0.0 New Device Keygen Source. }; static const u8 gen_keyseed[SE_KEY_128_SIZE] = diff --git a/nyx/nyx_gui/hos/hos.h b/nyx/nyx_gui/hos/hos.h index 7abaa389..94cf2aad 100644 --- a/nyx/nyx_gui/hos/hos.h +++ b/nyx/nyx_gui/hos/hos.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2018 naehrwert - * Copyright (c) 2018-2025 CTCaer + * Copyright (c) 2018-2026 CTCaer * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -49,7 +49,8 @@ enum { HOS_MKEY_VER_2000 = 19, HOS_MKEY_VER_2100 = 20, HOS_MKEY_VER_2200 = 21, - HOS_MKEY_VER_MAX = HOS_MKEY_VER_2200 + HOS_MKEY_VER_2300 = 22, + HOS_MKEY_VER_MAX = HOS_MKEY_VER_2300 }; #define HOS_TSEC_VERSION 4 //! TODO: Update on TSEC Root Key changes. diff --git a/nyx/nyx_gui/hos/pkg1.c b/nyx/nyx_gui/hos/pkg1.c index 1f1292ad..a8f9f90e 100644 --- a/nyx/nyx_gui/hos/pkg1.c +++ b/nyx/nyx_gui/hos/pkg1.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2018 naehrwert * Copyright (c) 2018 st4rk - * Copyright (c) 2018-2025 CTCaer + * Copyright (c) 2018-2026 CTCaer * Copyright (c) 2018 balika011 * * This program is free software; you can redistribute it and/or modify it @@ -68,7 +68,8 @@ static const pkg1_id_t _pkg1_ids[] = { { "20240808", 18, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, // 19.0.0 - 19.0.1. { "20250206", 19, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, // 20.0.0 - 20.5.0. { "20251009", 20, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, // 21.0.0 - 21.2.0. - { "20260123", 21, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, // 22.0.0+ + { "20260123", 21, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, // 22.0.0 - 22.5.0. + { "20260730", 22, 0x0E00, 0x6FE0, 0x40030000, 0x4003E000 }, // 23.0.0+ }; const pkg1_id_t *pkg1_identify(u8 *pkg1, char *build_date) diff --git a/nyx/nyx_gui/hos/pkg2.c b/nyx/nyx_gui/hos/pkg2.c index 31b9b475..0a30dde4 100644 --- a/nyx/nyx_gui/hos/pkg2.c +++ b/nyx/nyx_gui/hos/pkg2.c @@ -120,6 +120,8 @@ static const u8 mkey_vector_7xx[HOS_MKEY_VER_MAX - HOS_MKEY_VER_810 + 1][SE_KEY_ { 0xF7, 0x92, 0xC0, 0xEC, 0xF3, 0xA4, 0x8C, 0xB7, 0x0D, 0xB3, 0xF3, 0xAB, 0x10, 0x9B, 0x18, 0xBA }, // Master key 20 encrypted with 21. (21.0.0 with 22.0.0) { 0x14, 0xCB, 0x60, 0x29, 0x3D, 0xE0, 0xFB, 0xF2, 0x5B, 0x60, 0xB6, 0xC5, 0x2E, 0x77, 0x8F, 0x98 }, + // Master key 21 encrypted with 22. (22.0.0 with 23.0.0) + { 0x26, 0x87, 0xDF, 0x21, 0x44, 0xD4, 0x5F, 0x4E, 0x61, 0x03, 0x9E, 0xF3, 0x40, 0x04, 0xC3, 0x87 }, }; static bool _pkg2_key_unwrap_validate(pkg2_hdr_t *tmp_test, pkg2_hdr_t *hdr, u8 src_slot, u8 *mkey, const u8 *key_seed) From 45cd81ed08e30a26ba380958c7e20b55c342834b Mon Sep 17 00:00:00 2001 From: CTCaer Date: Thu, 10 Sep 2026 12:11:44 +0300 Subject: [PATCH 2/2] Bump hekate to v6.5.4 and Nyx to v1.9.4 --- Versions.inc | 4 ++-- bootloader/main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Versions.inc b/Versions.inc index 5fb788bd..b61f747e 100644 --- a/Versions.inc +++ b/Versions.inc @@ -1,11 +1,11 @@ # IPL Version. BLVERSION_MAJOR := 6 BLVERSION_MINOR := 5 -BLVERSION_HOTFX := 3 +BLVERSION_HOTFX := 4 BLVERSION_REL := 0 # Nyx Version. NYXVERSION_MAJOR := 1 NYXVERSION_MINOR := 9 -NYXVERSION_HOTFX := 3 +NYXVERSION_HOTFX := 4 NYXVERSION_REL := 0 diff --git a/bootloader/main.c b/bootloader/main.c index c381a1c5..862c4595 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -1426,7 +1426,7 @@ ment_t ment_top[] = { MDEF_END() }; -menu_t menu_top = { ment_top, "hekate v6.5.3", 0, 0 }; +menu_t menu_top = { ment_top, "hekate v6.5.4", 0, 0 }; extern void pivot_stack(u32 stack_top);