Step 1: Compile

source/keys/key_sources.inl

@@ -15,6 +15,9 @@
  */
 
 // Sha256 hash of the null string.
+#include <bdk.h>
+#include "../hos/hos.h"
+
 static const u8 null_hash[0x20] __attribute__((aligned(4))) = {
     0xE3, 0xB0, 0xC4, 0x42, 0x98, 0xFC, 0x1C, 0x14, 0x9A, 0xFB, 0xF4, 0xC8, 0x99, 0x6F, 0xB9, 0x24,
     0x27, 0xAE, 0x41, 0xE4, 0x64, 0x9B, 0x93, 0x4C, 0xA4, 0x95, 0x99, 0x1B, 0x78, 0x52, 0xB8, 0x55};

source/keys/keyfile.c

@@ -1,11 +1,9 @@
 #include "keys.h"
 #include "keyfile.h"
-#include <utils/types.h>
 #include <libs/fatfs/ff.h>
 #include <string.h>
-#include <utils/ini.h>
+#include <bdk.h>
 #include "../tegraexplorer/tconf.h"
-#include <storage/nx_sd.h>
 #include "../gfx/gfx.h"
 
 #define GetHexFromChar(c) ((c & 0x0F) + (c >= 'A' ? 9 : 0))

source/keys/keys.c

@@ -1,31 +1,10 @@
 #include "keys.h"
 
-#include "../config.h"
-#include <display/di.h>
-#include <gfx_utils.h>
-#include "../hos/pkg1.h"
-#include "../hos/pkg2.h"
-#include "../hos/sept.h"
 #include <libs/fatfs/ff.h>
-#include <mem/heap.h>
-#include <mem/mc.h>
-#include <mem/minerva.h>
-#include <mem/sdram.h>
-#include <sec/se.h>
-#include <sec/se_t210.h>
-#include <sec/tsec.h>
-#include <soc/fuse.h>
-#include <mem/smmu.h>
-#include <soc/t210.h>
+#include <bdk.h>
+#include "../config.h"
+#include "../hos/pkg1.h"
 #include "../storage/emummc.h"
-#include "../storage/nx_emmc.h"
-#include "../storage/nx_emmc_bis.h"
-#include <storage/nx_sd.h>
-#include <storage/sdmmc.h>
-#include <utils/btn.h>
-#include <utils/list.h>
-#include <utils/sprintf.h>
-#include <utils/util.h>
 #include "../gfx/gfx.h"
 #include "../tegraexplorer/tconf.h"
 #include "../storage/mountmanager.h"
@@ -37,6 +16,7 @@
 extern hekate_config h_cfg;
 
 #define DPRINTF(x)
+#define TSEC_KEY_DATA_OFFSET 0x300
 
 static int  _key_exists(const void *data) { return memcmp(data, "\x00\x00\x00\x00\x00\x00\x00\x00", 8) != 0; };
 
@@ -125,7 +105,7 @@ static void _derive_bis_keys(key_derivation_ctx_t *keys) {
 }
 
 static int _derive_master_keys_from_keyblobs(key_derivation_ctx_t *keys) {
-    u8 *keyblob_block = (u8 *)calloc(KB_FIRMWARE_VERSION_600 + 1, NX_EMMC_BLOCKSIZE);
+    u8 *keyblob_block = (u8 *)calloc(KB_FIRMWARE_VERSION_600 + 1, EMMC_BLOCKSIZE);
     encrypted_keyblob_t *current_keyblob = (encrypted_keyblob_t *)keyblob_block;
     u32 keyblob_mac[AES_128_KEY_SIZE / 4] = {0};
 
@@ -144,7 +124,7 @@ static int _derive_master_keys_from_keyblobs(key_derivation_ctx_t *keys) {
     se_aes_key_set(8, keys->tsec_keys, sizeof(keys->tsec_keys) / 2);
     se_aes_key_set(9, keys->sbk, 0x10);
 
-    if (!emummc_storage_read(&emmc_storage, KEYBLOB_OFFSET / NX_EMMC_BLOCKSIZE, KB_FIRMWARE_VERSION_600 + 1, keyblob_block)) {
+    if (!emummc_storage_read(KEYBLOB_OFFSET / EMMC_BLOCKSIZE, KB_FIRMWARE_VERSION_600 + 1, keyblob_block)) {
         DPRINTF("Unable to read keyblobs.");
     }
 
@@ -195,7 +175,7 @@ static bool _derive_tsec_keys(tsec_ctxt_t *tsec_ctxt, u32 kb, key_derivation_ctx
 
     mc_disable_ahb_redirect();
 
-    while (tsec_query(keys->tsec_keys, kb, tsec_ctxt) < 0) {
+    while (tsec_query(keys->tsec_keys, tsec_ctxt) < 0) {
         memset(keys->tsec_keys, 0, sizeof(keys->tsec_keys));
         retries++;
         if (retries > 15) {
@@ -204,7 +184,7 @@ static bool _derive_tsec_keys(tsec_ctxt_t *tsec_ctxt, u32 kb, key_derivation_ctx
         }
     }
 
-    mc_enable_ahb_redirect();
+    mc_enable_ahb_redirect(false);
 
     if (res < 0) {
         //EPRINTFARGS("ERROR %x dumping TSEC.\n", res);
@@ -227,11 +207,11 @@ static ALWAYS_INLINE u8 *_read_pkg1(const pkg1_id_t **pkg1_id) {
 
     // Read package1.
     u8 *pkg1 = (u8 *)malloc(PKG1_MAX_SIZE);
-    if (!emummc_storage_set_mmc_partition(&emmc_storage, EMMC_BOOT0)) {
+    if (!emummc_storage_set_mmc_partition(EMMC_BOOT0)) {
         DPRINTF("Unable to set partition.");
         return NULL;
     }
-    if (!emummc_storage_read(&emmc_storage, PKG1_OFFSET / NX_EMMC_BLOCKSIZE, PKG1_MAX_SIZE / NX_EMMC_BLOCKSIZE, pkg1)) {
+    if (!emummc_storage_read(PKG1_OFFSET / EMMC_BLOCKSIZE, PKG1_MAX_SIZE / EMMC_BLOCKSIZE, pkg1)) {
         DPRINTF("Unable to read pkg1.");
         return NULL;
     }

source/keys/keys.h

@@ -1,6 +1,8 @@
 #pragma once
 #include <utils/types.h>
-#include "../hos/hos.h"
+
+#define HOS_PKG11_MAGIC 0x31314B50
+#define HOS_EKS_MAGIC   0x30534B45
 
 #define AES_128_KEY_SIZE 16
 #define RSA_2048_KEY_SIZE 256
@@ -86,6 +88,23 @@ typedef struct {
     keyblob_t keyblob;
 } key_derivation_ctx_t;
 
+typedef struct _tsec_key_data_t
+{
+	u8 debug_key[0x10];
+	u8 blob0_auth_hash[0x10];
+	u8 blob1_auth_hash[0x10];
+	u8 blob2_auth_hash[0x10];
+	u8 blob2_aes_iv[0x10];
+	u8 hovi_eks_seed[0x10];
+	u8 hovi_common_seed[0x10];
+	u32 blob0_size;
+	u32 blob1_size;
+	u32 blob2_size;
+	u32 blob3_size;
+	u32 blob4_size;
+	u8 reserved[0x7C];
+} tsec_key_data_t;
+
 int DumpKeys();
 void PrintKey(u8 *key, u32 len);