Put .SHA NAND dump verification first / Fix H&S injection

Shadowtrance · Jun 7, 2016 · 8032142 · 8032142
1 parent 5f9e490
commit 8032142
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/source/decryptor/nand.c b/source/decryptor/nand.c
@@ -289,6 +289,14 @@ static u32 CheckNandDumpIntegrity(const char* path, bool check_firm) {
     u8 header[0x200];
     u32 nand_hdr_type = NAND_HDR_UNK;
 
+    Debug("Verifying dump via .SHA...");
+    u32 hash_res = HashVerifyFile(path);
+    if (hash_res == HASH_FAILED) {
+        Debug("Failed, file is corrupt!");
+        return 1;
+    }
+    Debug((hash_res == HASH_VERIFIED) ? "Verification passed" : ".SHA not found, skipped");
+
     if (!DebugFileOpen(path))
         return 1;
 
@@ -382,14 +390,6 @@ static u32 CheckNandDumpIntegrity(const char* path, bool check_firm) {
 
     FileClose();
 
-    Debug("Verifying dump via .SHA...");
-    u32 hash_res = HashVerifyFile(path);
-    if (hash_res == HASH_FAILED) {
-        Debug("Failed, file is corrupt!");
-        return 1;
-    }
-    Debug((hash_res == HASH_VERIFIED) ? "Verification passed" : ".SHA not found, skipped");
-
 
     return 0;
 }

diff --git a/source/decryptor/nandfat.c b/source/decryptor/nandfat.c
@@ -381,7 +381,7 @@ u32 InjectHealthAndSafety(u32 param)
         return 1;
 
     Debug("Injecting H&S app...");
-    if (EncryptFileToNand("hs.enc", offset_app[0], size_app[0], ctrnand_info) != 0)
+    if (EncryptFileToNand("hs.enc", offset_app[0], size_hs, ctrnand_info) != 0)
         return 1;
 
     Debug("Fixing TMD...");