OmniNX/hekate
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hos: simple refactor of defines

Browse Source
This commit is contained in:
CTCaer
2025-08-08 15:36:59 +03:00
parent b33ab240f2
commit de91ab507e
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bootloader/hos/hos.c
View File

@@ -36,8 +36,6 @@
({ gfx_con.mute = false; \ ({ gfx_con.mute = false; \
gfx_printf("%k"text"%k\n", TXT_CLR_ERROR, args, TXT_CLR_DEFAULT); }) gfx_printf("%k"text"%k\n", TXT_CLR_ERROR, args, TXT_CLR_DEFAULT); })
#define PKG2_LOAD_ADDR 0xA9800000
#define SECMON_BCT_CFG_ADDR 0x4003D000 #define SECMON_BCT_CFG_ADDR 0x4003D000
#define SECMON6_BCT_CFG_ADDR 0x4003F800 #define SECMON6_BCT_CFG_ADDR 0x4003F800
@@ -155,21 +153,8 @@ static void _se_lock(bool lock_se)
SE(SE_SE_SECURITY_REG) &= ~SE_PERKEY_SETTING; // Make access lock regs secure only. SE(SE_SE_SECURITY_REG) &= ~SE_PERKEY_SETTING; // Make access lock regs secure only.
} }
memset((void *)IPATCH_BASE, 0, 14 * sizeof(u32)); memset((void *)IPATCH_BASE, 0, (IPATCH_CAM_ENTRIES + 1) * sizeof(u32));
SB(SB_CSR) = SB_CSR_PIROM_DISABLE; SB(SB_CSR) = SB_CSR_PIROM_DISABLE;
// This is useful for documenting the bits in the SE config registers, so we can keep it around.
/*gfx_printf("SE(SE_SE_SECURITY_REG) = %08X\n", SE(SE_SE_SECURITY_REG));
gfx_printf("SE(0x4) = %08X\n", SE(0x4));
gfx_printf("SE(SE_CRYPTO_SECURITY_PERKEY_REG) = %08X\n", SE(SE_CRYPTO_SECURITY_PERKEY_REG));
gfx_printf("SE(SE_RSA_SECURITY_PERKEY_REG) = %08X\n", SE(SE_RSA_SECURITY_PERKEY_REG));
for (u32 i = 0; i < 16; i++)
gfx_printf("%02X ", SE(SE_CRYPTO_KEYTABLE_ACCESS_REG + i * 4) & 0xFF);
gfx_putc('\n');
for (u32 i = 0; i < 2; i++)
gfx_printf("%02X ", SE(SE_RSA_KEYTABLE_ACCESS_REG + i * 4) & 0xFF);
gfx_putc('\n');
gfx_hexdump(SE_BASE, (void *)SE_BASE, 0x400);*/
} }
static bool _hos_eks_rw_try(u8 *buf, bool write) static bool _hos_eks_rw_try(u8 *buf, bool write)
@@ -201,7 +186,7 @@ static void _hos_eks_get()
if (!h_cfg.eks) if (!h_cfg.eks)
{ {
// Read EKS blob. // Read EKS blob.
u8 *mbr = zalloc(SD_BLOCKSIZE); u8 *mbr = malloc(SD_BLOCKSIZE);
if (!_hos_eks_rw_try(mbr, false)) if (!_hos_eks_rw_try(mbr, false))
goto out; goto out;
@@ -231,7 +216,7 @@ static void _hos_eks_save()
bool new_eks = false; bool new_eks = false;
if (!h_cfg.eks) if (!h_cfg.eks)
{ {
h_cfg.eks = zalloc(SD_BLOCKSIZE); h_cfg.eks = zalloc(sizeof(hos_eks_mbr_t));
new_eks = true; new_eks = true;
} }
@@ -239,7 +224,7 @@ static void _hos_eks_save()
if (h_cfg.eks->enabled != HOS_EKS_TSEC_VER) if (h_cfg.eks->enabled != HOS_EKS_TSEC_VER)
{ {
// Read EKS blob. // Read EKS blob.
u8 *mbr = zalloc(SD_BLOCKSIZE); u8 *mbr = malloc(SD_BLOCKSIZE);
if (!_hos_eks_rw_try(mbr, false)) if (!_hos_eks_rw_try(mbr, false))
{ {
if (new_eks) if (new_eks)
@@ -256,9 +241,9 @@ static void _hos_eks_save()
se_get_aes_keys(keys + SZ_4K, keys, SE_KEY_128_SIZE); se_get_aes_keys(keys + SZ_4K, keys, SE_KEY_128_SIZE);
// Set magic and personalized info. // Set magic and personalized info.
h_cfg.eks->magic = HOS_EKS_MAGIC; h_cfg.eks->magic = HOS_EKS_MAGIC;
h_cfg.eks->enabled = HOS_EKS_TSEC_VER; h_cfg.eks->enabled = HOS_EKS_TSEC_VER;
h_cfg.eks->lot0 = FUSE(FUSE_OPT_LOT_CODE_0); h_cfg.eks->lot0 = FUSE(FUSE_OPT_LOT_CODE_0);
// Copy new keys. // Copy new keys.
memcpy(h_cfg.eks->tsec, keys + 12 * SE_KEY_128_SIZE, SE_KEY_128_SIZE); memcpy(h_cfg.eks->tsec, keys + 12 * SE_KEY_128_SIZE, SE_KEY_128_SIZE);
@@ -266,7 +251,7 @@ static void _hos_eks_save()
memcpy(h_cfg.eks->troot_dev, keys + 11 * SE_KEY_128_SIZE, SE_KEY_128_SIZE); memcpy(h_cfg.eks->troot_dev, keys + 11 * SE_KEY_128_SIZE, SE_KEY_128_SIZE);
// Encrypt EKS blob. // Encrypt EKS blob.
u8 *eks = zalloc(SD_BLOCKSIZE); u8 *eks = malloc(sizeof(hos_eks_mbr_t));
memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t)); memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t));
se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t)); se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t));
@@ -293,7 +278,7 @@ static void _hos_eks_clear(u32 mkey)
if (h_cfg.eks->enabled) if (h_cfg.eks->enabled)
{ {
// Read EKS blob. // Read EKS blob.
u8 *mbr = zalloc(SD_BLOCKSIZE); u8 *mbr = malloc(SD_BLOCKSIZE);
if (!_hos_eks_rw_try(mbr, false)) if (!_hos_eks_rw_try(mbr, false))
goto out; goto out;
@@ -301,7 +286,7 @@ static void _hos_eks_clear(u32 mkey)
h_cfg.eks->enabled = 0; h_cfg.eks->enabled = 0;
// Encrypt EKS blob. // Encrypt EKS blob.
u8 *eks = zalloc(SD_BLOCKSIZE); u8 *eks = malloc(sizeof(hos_eks_mbr_t));
memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t)); memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t));
se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t)); se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t));
@@ -590,7 +575,7 @@ static int _read_emmc_pkg1(launch_ctxt_t *ctxt)
try_load: try_load:
// Read package1. // Read package1.
emummc_storage_set_mmc_partition(EMMC_BOOT0); emummc_storage_set_mmc_partition(EMMC_BOOT0);
emummc_storage_read(bootloader_offset / EMMC_BLOCKSIZE, PKG1_BOOTLOADER_SIZE / EMMC_BLOCKSIZE, ctxt->pkg1); emummc_storage_read(bootloader_offset, PKG1_BOOTLOADER_SIZE / EMMC_BLOCKSIZE, ctxt->pkg1);
ctxt->pkg1_id = pkg1_identify(ctxt->pkg1 + pk1_offset); ctxt->pkg1_id = pkg1_identify(ctxt->pkg1 + pk1_offset);
if (!ctxt->pkg1_id) if (!ctxt->pkg1_id)

7
bootloader/hos/pkg1.h
View File

@@ -27,9 +27,10 @@
#define PK11_SECTION_SM 2 #define PK11_SECTION_SM 2
#define PKG1_BOOTLOADER_SIZE SZ_256K #define PKG1_BOOTLOADER_SIZE SZ_256K
#define PKG1_BOOTLOADER_MAIN_OFFSET 0x100000 #define PKG1_BOOTLOADER_MAIN_OFFSET (0x100000 / EMMC_BLOCKSIZE)
#define PKG1_BOOTLOADER_BACKUP_OFFSET 0x140000 #define PKG1_BOOTLOADER_BACKUP_OFFSET (0x140000 / EMMC_BLOCKSIZE)
#define PKG1_HOS_EKS_OFFSET 0x180000 #define PKG1_BOOTLOADER_SAFE_OFFSET (0x000000 / EMMC_BLOCKSIZE)
#define PKG1_HOS_EKS_OFFSET (0x180000 / EMMC_BLOCKSIZE)
#define PKG1_ERISTA_ON_MARIKO_MAGIC 0xE59FD00C // For 4.0.0 Erista and up. #define PKG1_ERISTA_ON_MARIKO_MAGIC 0xE59FD00C // For 4.0.0 Erista and up.
#define PKG1_MARIKO_ON_ERISTA_MAGIC 0x40010040 // Mariko pkg1 entrypoint. #define PKG1_MARIKO_ON_ERISTA_MAGIC 0x40010040 // Mariko pkg1 entrypoint.

2
bootloader/hos/pkg2.h
View File

@@ -20,6 +20,8 @@
#include <bdk.h> #include <bdk.h>
#define PKG2_LOAD_ADDR 0xA9800000
#define PKG2_MAGIC 0x31324B50 #define PKG2_MAGIC 0x31324B50
#define PKG2_SEC_BASE 0x80000000 #define PKG2_SEC_BASE 0x80000000
#define PKG2_SEC_KERNEL 0 #define PKG2_SEC_KERNEL 0

16
nyx/nyx_gui/hos/hos.c
View File

@@ -198,7 +198,7 @@ static void _hos_eks_get()
if (!h_cfg.eks) if (!h_cfg.eks)
{ {
// Read EKS blob. // Read EKS blob.
u8 *mbr = zalloc(SD_BLOCKSIZE); u8 *mbr = malloc(SD_BLOCKSIZE);
if (!hos_eks_rw_try(mbr, false)) if (!hos_eks_rw_try(mbr, false))
goto out; goto out;
@@ -228,7 +228,7 @@ static void _hos_eks_save()
bool new_eks = false; bool new_eks = false;
if (!h_cfg.eks) if (!h_cfg.eks)
{ {
h_cfg.eks = zalloc(SD_BLOCKSIZE); h_cfg.eks = zalloc(sizeof(hos_eks_mbr_t));
new_eks = true; new_eks = true;
} }
@@ -236,7 +236,7 @@ static void _hos_eks_save()
if (h_cfg.eks->enabled != HOS_EKS_TSEC_VER) if (h_cfg.eks->enabled != HOS_EKS_TSEC_VER)
{ {
// Read EKS blob. // Read EKS blob.
u8 *mbr = zalloc(SD_BLOCKSIZE); u8 *mbr = malloc(SD_BLOCKSIZE);
if (!hos_eks_rw_try(mbr, false)) if (!hos_eks_rw_try(mbr, false))
{ {
if (new_eks) if (new_eks)
@@ -253,9 +253,9 @@ static void _hos_eks_save()
se_get_aes_keys(keys + SZ_4K, keys, SE_KEY_128_SIZE); se_get_aes_keys(keys + SZ_4K, keys, SE_KEY_128_SIZE);
// Set magic and personalized info. // Set magic and personalized info.
h_cfg.eks->magic = HOS_EKS_MAGIC; h_cfg.eks->magic = HOS_EKS_MAGIC;
h_cfg.eks->enabled = HOS_EKS_TSEC_VER; h_cfg.eks->enabled = HOS_EKS_TSEC_VER;
h_cfg.eks->lot0 = FUSE(FUSE_OPT_LOT_CODE_0); h_cfg.eks->lot0 = FUSE(FUSE_OPT_LOT_CODE_0);
// Copy new keys. // Copy new keys.
memcpy(h_cfg.eks->tsec, keys + 12 * SE_KEY_128_SIZE, SE_KEY_128_SIZE); memcpy(h_cfg.eks->tsec, keys + 12 * SE_KEY_128_SIZE, SE_KEY_128_SIZE);
@@ -263,7 +263,7 @@ static void _hos_eks_save()
memcpy(h_cfg.eks->troot_dev, keys + 11 * SE_KEY_128_SIZE, SE_KEY_128_SIZE); memcpy(h_cfg.eks->troot_dev, keys + 11 * SE_KEY_128_SIZE, SE_KEY_128_SIZE);
// Encrypt EKS blob. // Encrypt EKS blob.
u8 *eks = zalloc(SD_BLOCKSIZE); u8 *eks = malloc(sizeof(hos_eks_mbr_t));
memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t)); memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t));
se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t)); se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t));
@@ -290,7 +290,7 @@ void hos_eks_clear(u32 mkey)
if (h_cfg.eks->enabled) if (h_cfg.eks->enabled)
{ {
// Read EKS blob. // Read EKS blob.
u8 *mbr = zalloc(SD_BLOCKSIZE); u8 *mbr = malloc(SD_BLOCKSIZE);
if (!hos_eks_rw_try(mbr, false)) if (!hos_eks_rw_try(mbr, false))
goto out; goto out;
@@ -298,7 +298,7 @@ void hos_eks_clear(u32 mkey)
h_cfg.eks->enabled = 0; h_cfg.eks->enabled = 0;
// Encrypt EKS blob. // Encrypt EKS blob.
u8 *eks = zalloc(SD_BLOCKSIZE); u8 *eks = malloc(sizeof(hos_eks_mbr_t));
memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t)); memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t));
se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t)); se_aes_crypt_ecb(14, ENCRYPT, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t));