Various small fixes

nyx/nyx_gui/hos/hos.c

@@ -2,7 +2,7 @@
  * Copyright (c) 2018 naehrwert
  * Copyright (c) 2018 st4rk
  * Copyright (c) 2018 Ced2911
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
  * Copyright (c) 2018 balika011
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
 #include "../soc/pmc.h"
 #include "../soc/smmu.h"
 #include "../soc/t210.h"
+#include "../storage/mbr_gpt.h"
 #include "../storage/nx_emmc.h"
 #include "../storage/nx_sd.h"
 #include "../storage/sdmmc.h"
@@ -90,15 +91,42 @@ static const u8 master_keyseed_620[0x10] =
 static const u8 console_keyseed_4xx_5xx[0x10] =
 	{ 0x0C, 0x91, 0x09, 0xDB, 0x93, 0x93, 0x07, 0x81, 0x07, 0x3C, 0xC4, 0x16, 0x22, 0x7C, 0x6C, 0x28 };
 
+bool hos_eks_rw_try(u8 *buf, bool write)
+{
+	mbr_t *mbr = (mbr_t *)buf;
+	for (u32 i = 0; i < 3; i++)
+	{
+		if (!write)
+		{
+			if (sdmmc_storage_read(&sd_storage, 0, 1, mbr))
+			{
+				if (mbr->partitions[0].status != 0xFF &&
+					mbr->partitions[0].start_sct &&
+					mbr->partitions[0].size_sct)
+					return true;
+				else
+					return false;
+			}
+		}
+		else
+		{
+			if (sdmmc_storage_write(&sd_storage, 0, 1, mbr))
+				return true;
+		}
+	}
+
+	return false;
+}
+
 void hos_eks_get()
 {
 	// Check if EKS already found and parsed.
 	if (!h_cfg.eks)
 	{
-		u8 *mbr = calloc(512 , 1);
-
 		// Read EKS blob.
-		sdmmc_storage_read(&sd_storage, 0, 1, mbr);
+		u8 *mbr = calloc(512 , 1);
+		if (!hos_eks_rw_try(mbr, false))
+			goto out;
 
 		// Decrypt EKS blob.
 		hos_eks_mbr_t *eks = (hos_eks_mbr_t *)(mbr + 0x10);
@@ -115,6 +143,7 @@ void hos_eks_get()
 			return;
 		}
 
+out:
 		free(mbr);
 	}
 }
@@ -128,12 +157,29 @@ void hos_eks_save(u32 kb)
 		if (key_idx > 5)
 			return;
 
+		bool new_eks = false;
 		if (!h_cfg.eks)
+		{
 			h_cfg.eks = calloc(512 , 1);
+			new_eks = true;
+		}
 
 		// If matching blob doesn't exist, create it.
 		if (!(h_cfg.eks->enabled & (1 << key_idx)))
 		{
+			// Read EKS blob.
+			u8 *mbr = calloc(512 , 1);
+			if (!hos_eks_rw_try(mbr, false))
+			{
+				if (new_eks)
+				{
+					free(h_cfg.eks);
+					h_cfg.eks = NULL;
+				}
+
+				goto out;
+			}
+
 			// Get keys.
 			u8 *keys = (u8 *)calloc(0x1000, 1);
 			se_get_aes_keys(keys + 0x800, keys, 0x10);
@@ -151,20 +197,21 @@ void hos_eks_save(u32 kb)
 			memcpy(h_cfg.eks->keys[key_idx].fdk, keys + 13 * 0x10, 0x10);
 			memcpy(h_cfg.eks->keys[key_idx].dkk, keys + 15 * 0x10, 0x10);
 
-			// Encrypt EKS.
+			// Encrypt EKS blob.
 			u8 *eks = calloc(512 , 1);
 			memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t));
 			se_aes_crypt_ecb(14, 1, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t));
 
-			// Write EKS to SD.
-			u8 *mbr = calloc(512 , 1);
-			sdmmc_storage_read(&sd_storage, 0, 1, mbr);
+			// Write EKS blob to SD.
+			memset(mbr, 0, 0x10);
 			memcpy(mbr + 0x10, eks, sizeof(hos_eks_mbr_t));
-			sdmmc_storage_write(&sd_storage, 0, 1, mbr);
+			hos_eks_rw_try(mbr, true);
+
 
 			free(eks);
-			free(mbr);
 			free(keys);
+out:
+			free(mbr);
 		}
 	}
 }
@@ -177,25 +224,30 @@ void hos_eks_clear(u32 kb)
 		u8 key_idx = kb - KB_FIRMWARE_VERSION_700;
 		if (h_cfg.eks->enabled & (1 << key_idx))
 		{
+			// Read EKS blob.
+			u8 *mbr = calloc(512 , 1);
+			if (!hos_eks_rw_try(mbr, false))
+				goto out;
+
 			// Disable current Master key version.
 			h_cfg.eks->enabled &= ~(1 << key_idx);
 
-			// Encrypt EKS.
+			// Encrypt EKS blob.
 			u8 *eks = calloc(512 , 1);
 			memcpy(eks, h_cfg.eks, sizeof(hos_eks_mbr_t));
 			se_aes_crypt_ecb(14, 1, eks, sizeof(hos_eks_mbr_t), eks, sizeof(hos_eks_mbr_t));
 
-			// Write EKS to SD.
-			u8 *mbr = calloc(512 , 1);
-			sdmmc_storage_read(&sd_storage, 0, 1, mbr);
+			// Write EKS blob to SD.
 			memcpy(mbr + 0x10, eks, sizeof(hos_eks_mbr_t));
-			sdmmc_storage_write(&sd_storage, 0, 1, mbr);
+			hos_eks_rw_try(mbr, true);
 
 			free(eks);
+out:
 			free(mbr);
 		}
 	}
 }
+
 int hos_keygen(u8 *keyblob, u32 kb, tsec_ctxt_t *tsec_ctxt)
 {
 	u8 tmp[0x20];

nyx/nyx_gui/hos/hos.h

@@ -68,7 +68,7 @@ typedef struct _hos_eks_mbr_t
 	u32 rsvd2[3];
 } hos_eks_mbr_t;
 
-static_assert(sizeof(hos_eks_mbr_t) < 424, "HOS EKS storage bigger than MBR!");
+static_assert(sizeof(hos_eks_mbr_t) == 416, "HOS EKS storage bigger than MBR!");
 
 typedef struct _launch_ctxt_t
 {