From 8ef9f888f628369121efdbb8c673ed0e6495260b Mon Sep 17 00:00:00 2001 From: CTCaer Date: Sat, 4 Jul 2020 21:35:26 +0300 Subject: [PATCH] hos: Add PK21 decryption support for Mariko --- bootloader/hos/pkg2.c | 2 +- nyx/nyx_gui/hos/pkg2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootloader/hos/pkg2.c b/bootloader/hos/pkg2.c index b624e47..ab362c3 100644 --- a/bootloader/hos/pkg2.c +++ b/bootloader/hos/pkg2.c @@ -1314,7 +1314,7 @@ pkg2_hdr_t *pkg2_decrypt(void *data, u8 kb) if ((kb >= KB_FIRMWARE_VERSION_810) && (kb < KB_FIRMWARE_VERSION_MAX)) { u8 tmp_mkey[0x10]; - u8 decr_slot = !h_cfg.aes_slots_new ? 12 : 13; // Sept mkey. + u8 decr_slot = !h_cfg.t210b01 ? (!h_cfg.aes_slots_new ? 12 : 13) : 7; // Sept mkey or T210B01 mkey. u8 mkey_seeds_cnt = sizeof(mkey_vector_8xx) / 0x10; u8 mkey_seeds_idx = mkey_seeds_cnt; // Real index + 1. u8 mkey_seeds_min_idx = mkey_seeds_cnt - (KB_FIRMWARE_VERSION_MAX - kb); diff --git a/nyx/nyx_gui/hos/pkg2.c b/nyx/nyx_gui/hos/pkg2.c index 36f087e..93900fa 100644 --- a/nyx/nyx_gui/hos/pkg2.c +++ b/nyx/nyx_gui/hos/pkg2.c @@ -159,7 +159,7 @@ pkg2_hdr_t *pkg2_decrypt(void *data, u8 kb) if ((kb >= KB_FIRMWARE_VERSION_810) && (kb < KB_FIRMWARE_VERSION_MAX)) { u8 tmp_mkey[0x10]; - u8 decr_slot = !h_cfg.aes_slots_new ? 12 : 13; // Sept mkey. + u8 decr_slot = !h_cfg.t210b01 ? (!h_cfg.aes_slots_new ? 12 : 13) : 7; // Sept mkey or T210B01 mkey. u8 mkey_seeds_cnt = sizeof(mkey_vector_8xx) / 0x10; u8 mkey_seeds_idx = mkey_seeds_cnt; // Real index + 1. u8 mkey_seeds_min_idx = mkey_seeds_cnt - (KB_FIRMWARE_VERSION_MAX - kb);