nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-23 03:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't run hos keygen twice + Fix memory leaks

Browse source
This commit is contained in:
Kostas Missos 2018-07-07 18:36:18 +03:00
parent 19e9292128
commit 60905c3829
2 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ipl/hos.c
View file

@ -43,6 +43,8 @@ extern void sd_unmount();
//#define DPRINTF(...) gfx_printf(&gfx_con, __VA_ARGS__) //#define DPRINTF(...) gfx_printf(&gfx_con, __VA_ARGS__)
#define DPRINTF(...) #define DPRINTF(...)
extern int se_keygen_done;
typedef struct _launch_ctxt_t typedef struct _launch_ctxt_t
{ {
void *keyblob; void *keyblob;
@ -209,7 +211,7 @@ int keygen(u8 *keyblob, u32 kb, void *tsec_fw)
return 1; return 1;
} }
static void _copy_bootconfig(launch_ctxt_t *ctxt) static void _copy_bootconfig()
{ {
sdmmc_storage_t storage; sdmmc_storage_t storage;
sdmmc_t sdmmc; sdmmc_t sdmmc;
@ -247,7 +249,7 @@ static int _read_emmc_pkg1(launch_ctxt_t *ctxt)
gfx_printf(&gfx_con, "Identified package1 ('%s'),\nKeyblob version %d\n\n", (char *)(ctxt->pkg1 + 0x10), ctxt->pkg1_id->kb); gfx_printf(&gfx_con, "Identified package1 ('%s'),\nKeyblob version %d\n\n", (char *)(ctxt->pkg1 + 0x10), ctxt->pkg1_id->kb);
//Read the correct keyblob. //Read the correct keyblob.
ctxt->keyblob = (u8 *)malloc(NX_EMMC_BLOCKSIZE); ctxt->keyblob = (u8 *)calloc(NX_EMMC_BLOCKSIZE, 1);
sdmmc_storage_read(&storage, 0x180000 / NX_EMMC_BLOCKSIZE + ctxt->pkg1_id->kb, 1, ctxt->keyblob); sdmmc_storage_read(&storage, 0x180000 / NX_EMMC_BLOCKSIZE + ctxt->pkg1_id->kb, 1, ctxt->keyblob);
res = 1; res = 1;
@ -406,6 +408,16 @@ static int _config(launch_ctxt_t *ctxt, ini_sec_t *cfg)
return 1; return 1;
} }
static void _free_launch_components(launch_ctxt_t *ctxt)
{
free(ctxt->keyblob);
free(ctxt->pkg1);
free(ctxt->pkg2);
free(ctxt->warmboot);
free(ctxt->secmon);
free(ctxt->kernel);
}
int hos_launch(ini_sec_t *cfg) int hos_launch(ini_sec_t *cfg)
{ {
int bootStateDramPkg2 = 0; int bootStateDramPkg2 = 0;
@ -434,8 +446,11 @@ int hos_launch(ini_sec_t *cfg)
gfx_printf(&gfx_con, "Loaded package1 and keyblob\n"); gfx_printf(&gfx_con, "Loaded package1 and keyblob\n");
// Generate keys. // Generate keys.
keygen(ctxt.keyblob, ctxt.pkg1_id->kb, (u8 *)ctxt.pkg1 + ctxt.pkg1_id->tsec_off); if (!se_keygen_done)
DPRINTF("Generated keys\n"); {
keygen(ctxt.keyblob, ctxt.pkg1_id->kb, (u8 *)ctxt.pkg1 + ctxt.pkg1_id->tsec_off);
DPRINTF("Generated keys\n");
}
// Decrypt and unpack package1 if we require parts of it. // Decrypt and unpack package1 if we require parts of it.
if (!ctxt.warmboot || !ctxt.secmon) if (!ctxt.warmboot || !ctxt.secmon)
@ -552,11 +567,11 @@ int hos_launch(ini_sec_t *cfg)
if (!exoFwNumber) if (!exoFwNumber)
exoFwNumber = 3; exoFwNumber = 3;
break; break;
default:
case KB_FIRMWARE_VERSION_400: case KB_FIRMWARE_VERSION_400:
if (!exoFwNumber) if (!exoFwNumber)
exoFwNumber = 4; exoFwNumber = 4;
case KB_FIRMWARE_VERSION_500: case KB_FIRMWARE_VERSION_500:
default:
se_key_acc_ctrl(12, 0xFF); se_key_acc_ctrl(12, 0xFF);
se_key_acc_ctrl(15, 0xFF); se_key_acc_ctrl(15, 0xFF);
bootStateDramPkg2 = 2; bootStateDramPkg2 = 2;
@ -566,6 +581,10 @@ int hos_launch(ini_sec_t *cfg)
break; break;
} }
// Free allocated memory.
ini_free_section(cfg);
_free_launch_components(&ctxt);
// Copy BCT if debug mode is enabled. // Copy BCT if debug mode is enabled.
memset((void *)0x4003D000, 0, 0x3000); memset((void *)0x4003D000, 0, 0x3000);
if(ctxt.debugmode) if(ctxt.debugmode)

23
ipl/main.c
View file

@ -78,6 +78,8 @@ u8 *Kc_MENU_LOGO;
hekate_config h_cfg; hekate_config h_cfg;
int se_keygen_done = 0;
int sd_mount() int sd_mount()
{ {
if (sd_mounted) if (sd_mounted)
@ -1539,12 +1541,18 @@ void dump_package1()
goto out; goto out;
} }
// Read keyblob. if (!se_keygen_done)
u8 * keyblob = (u8 *)malloc(NX_EMMC_BLOCKSIZE); {
sdmmc_storage_read(&storage, 0x180000 / NX_EMMC_BLOCKSIZE + pkg1_id->kb, 1, keyblob); // Read keyblob.
u8 *keyblob = (u8 *)calloc(NX_EMMC_BLOCKSIZE, 1);
sdmmc_storage_read(&storage, 0x180000 / NX_EMMC_BLOCKSIZE + pkg1_id->kb, 1, keyblob);
// Decrypt. // Decrypt.
keygen(keyblob, pkg1_id->kb, (u8 *)pkg1 + pkg1_id->tsec_off); keygen(keyblob, pkg1_id->kb, (u8 *)pkg1 + pkg1_id->tsec_off);
se_keygen_done = 1;
free(keyblob);
}
pkg1_decrypt(pkg1_id, pkg1); pkg1_decrypt(pkg1_id, pkg1);
pkg1_unpack(warmboot, secmon, loader, pkg1_id, pkg1); pkg1_unpack(warmboot, secmon, loader, pkg1_id, pkg1);
@ -1588,9 +1596,6 @@ void dump_package1()
} }
gfx_puts(&gfx_con, "Warmboot dumped to warmboot.bin\n"); gfx_puts(&gfx_con, "Warmboot dumped to warmboot.bin\n");
sdmmc_storage_end(&storage);
sd_unmount();
gfx_puts(&gfx_con, "\nDone. Press any key...\n"); gfx_puts(&gfx_con, "\nDone. Press any key...\n");
out:; out:;
@ -1598,6 +1603,8 @@ out:;
free(secmon); free(secmon);
free(warmboot); free(warmboot);
free(loader); free(loader);
sdmmc_storage_end(&storage);
sd_unmount();
btn_wait(); btn_wait();
} }