sept: Correct bct buffer pointer and turn on backlight on error

This commit is contained in:
CTCaer 2021-02-06 17:14:07 +02:00
parent c5152f6a9d
commit b6e458e97b
4 changed files with 11 additions and 6 deletions

View file

@ -33,6 +33,7 @@
#include <storage/sdmmc.h> #include <storage/sdmmc.h>
#include <utils/btn.h> #include <utils/btn.h>
#include <utils/types.h> #include <utils/types.h>
#include <utils/util.h>
#include <gfx_utils.h> #include <gfx_utils.h>
@ -129,13 +130,17 @@ void check_sept(ini_sec_t *cfg_sec)
} }
u8 *bct_bldr = (u8 *)calloc(1, 512); u8 *bct_bldr = (u8 *)calloc(1, 512);
sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, &bct_bldr); sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, bct_bldr);
u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144]; u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144];
free(bct_bldr); free(bct_bldr);
if (bootloader_entrypoint > SEPT_PRI_ENTRY) if (bootloader_entrypoint > SEPT_PRI_ENTRY)
{ {
gfx_con.mute = false; gfx_con.mute = false;
EPRINTF("Failed to run sept\n""Main BCT is improper!\nRun sept with proper BCT at least once\nto cache keys."); EPRINTF("Failed to run sept\n""Main BCT is improper!\nRun sept with proper BCT at least once\nto cache keys.");
gfx_printf("\nPress any key...\n");
display_backlight_brightness(h_cfg.backlight, 1000);
msleep(500);
btn_wait();
goto out_free; goto out_free;
} }

View file

@ -371,13 +371,13 @@ try_load:
{ {
// Check that BCT is proper so sept can run. // Check that BCT is proper so sept can run.
u8 *bct_bldr = (u8 *)calloc(1, 512); u8 *bct_bldr = (u8 *)calloc(1, 512);
sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, &bct_bldr); sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, bct_bldr);
u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144]; u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144];
free(bct_bldr); free(bct_bldr);
if (bootloader_entrypoint > SEPT_PRI_ENTRY) if (bootloader_entrypoint > SEPT_PRI_ENTRY)
{ {
lv_label_set_text(lb_desc, "#FFDD00 Failed to run sept because main BCT is improper!#\n" lv_label_set_text(lb_desc, "#FFDD00 Main BCT is improper! Failed to run sept.#\n"
"#FFDD00 Run sept with proper BCT at least once to cache keys.#\n"); "#FFDD00 Run sept with proper BCT at least once#\n#FFDD00 to cache keys.#\n");
goto out; goto out;
} }

View file

@ -1160,7 +1160,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
{ {
// Check that BCT is proper so sept can run. // Check that BCT is proper so sept can run.
u8 *bct_bldr = (u8 *)calloc(1, 512); u8 *bct_bldr = (u8 *)calloc(1, 512);
sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, &bct_bldr); sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, bct_bldr);
u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144]; u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144];
free(bct_bldr); free(bct_bldr);
if (bootloader_entrypoint > SEPT_PRI_ENTRY) if (bootloader_entrypoint > SEPT_PRI_ENTRY)