enable nogc by default; slightly better way to filter nogc out

Merge pull request #27 from fgsfdsfgs/master
Slightly better way to toggle nogc
Slightly better way to toggle nogc
Reisyukaku
Unified Split

Showing with 59 additions and 33 deletions.

+1 −1 NX_Sysmodules

+9 −2 src/firmware.c

+45 −26 src/kippatches.c

+4 −4 src/kippatches/fs.inc
diff --git a/NX_Sysmodules b/NX_Sysmodules
diff --git a/src/firmware.c b/src/firmware.c
@@ -25,7 +25,7 @@
 #include "firmware.h"
 #include "kippatches.h"

-#define VERSION "v0.1"
+#define VERSION "v1.0"

 static pk11_offs *pk11Offs = NULL;

@@ -159,7 +159,14 @@ void patch(pk11_offs *pk11, pkg2_hdr_t *pkg2, link_t *kips) {
    }

    u8 kipHash[0x20];
-    char *patchFilter[] = { "nogc", "nosigchk", "nocmac", NULL };
+    char *patchFilter[] = { "nosigchk", "nocmac", "nogc", NULL };
+
+    // enable nogc if there's a file called "nogc" in /ReiNX/ 
+    //(I expect the 1% of people this effects can read the guide)
+    if (!fopen("/ReiNX/nogc", "rb")) {
+        patchFilter[2] = NULL;
+        fclose();
+    }

    //Patch FS module (truly not my proudest code TODO cleanup)
    LIST_FOREACH_ENTRY(pkg2_kip1_info_t, ki, kips, link) {        
diff --git a/src/kippatches.c b/src/kippatches.c
@@ -17,32 +17,36 @@
 #include <string.h>

 #include "hwinit/types.h"
+#include "hwinit/util.h"
 #include "kippatches.h"
 #include "fs.h"
 #include "kippatches/fs.inc"

+#define NOP 0xD503201F
+
+
 // TODO: get full hashes somewhere and not just the first 16 bytes
 // every second one is the exfat version
 kippatchset_t kip_patches[] = {
-  { "FS", "\xde\x9f\xdd\xa4\x08\x5d\xd5\xfe\x68\xdc\xb2\x0b\x41\x09\x5b\xb4", fs_kip_patches_100 },
-  { "FS", "\xfc\x3e\x80\x99\x1d\xca\x17\x96\x4a\x12\x1f\x04\xb6\x1b\x17\x5e", fs_kip_patches_100 },
-  { "FS", "\xcd\x7b\xbe\x18\xd6\x13\x0b\x28\xf6\x2f\x19\xfa\x79\x45\x53\x5b", fs_kip_patches_200 },
-  { "FS", "\xe7\x66\x92\xdf\xaa\x04\x20\xe9\xfd\xd6\x8e\x43\x63\x16\x18\x18", fs_kip_patches_200 },
-  { "FS", "\x0d\x70\x05\x62\x7b\x07\x76\x7c\x0b\x96\x3f\x9a\xff\xdd\xe5\x66", fs_kip_patches_210 },
-  { "FS", "\xdb\xd8\x5f\xca\xcc\x19\x3d\xa8\x30\x51\xc6\x64\xe6\x45\x2d\x32", fs_kip_patches_210 },
-  { "FS", "\xa8\x6d\xa5\xe8\x7e\xf1\x09\x7b\x23\xda\xb5\xb4\xdb\xba\xef\xe7", fs_kip_patches_300 },
-  { "FS", "\x98\x1c\x57\xe7\xf0\x2f\x70\xf7\xbc\xde\x75\x31\x81\xd9\x01\xa6", fs_kip_patches_300 },
-  { "FS", "\x57\x39\x7c\x06\x3f\x10\xb6\x31\x3f\x4d\x83\x76\x53\xcc\xc3\x71", fs_kip_patches_301 },
-  { "FS", "\x07\x30\x99\xd7\xc6\xad\x7d\x89\x83\xbc\x7a\xdd\x93\x2b\xe3\xd1", fs_kip_patches_301 },
-  { "FS", "\x06\xe9\x07\x19\x59\x5a\x01\x0c\x62\x46\xff\x70\x94\x6f\x10\xfb", fs_kip_patches_401 },
-  { "FS", "\x54\x9b\x0f\x8d\x6f\x72\xc4\xe9\xf3\xfd\x1f\x19\xea\xce\x4a\x5a", fs_kip_patches_401 },
-  { "FS", "\x80\x96\xaf\x7c\x6a\x35\xaa\x82\x71\xf3\x91\x69\x95\x41\x3b\x0b", fs_kip_patches_410 },
-  { "FS", "\x02\xd5\xab\xaa\xfd\x20\xc8\xb0\x63\x3a\xa0\xdb\xae\xe0\x37\x7e", fs_kip_patches_410 },
-  { "FS", "\xa6\xf2\x7a\xd9\xac\x7c\x73\xad\x41\x9b\x63\xb2\x3e\x78\x5a\x0c", fs_kip_patches_500 },
-  { "FS", "\xce\x3e\xcb\xa2\xf2\xf0\x62\xf5\x75\xf8\xf3\x60\x84\x2b\x32\xb4", fs_kip_patches_500 },
-  { "FS", "\x76\xf8\x74\x02\xc9\x38\x7c\x0f\x0a\x2f\xab\x1b\x45\xce\xbb\x93", fs_kip_patches_510 },
-  { "FS", "\x10\xb2\xd8\x16\x05\x48\x85\x99\xdf\x22\x42\xcb\x6b\xac\x2d\xf1", fs_kip_patches_510 },
-  { NULL, NULL, NULL },
+    { "FS", "\xde\x9f\xdd\xa4\x08\x5d\xd5\xfe\x68\xdc\xb2\x0b\x41\x09\x5b\xb4", fs_kip_patches_100 },
+    { "FS", "\xfc\x3e\x80\x99\x1d\xca\x17\x96\x4a\x12\x1f\x04\xb6\x1b\x17\x5e", fs_kip_patches_100 },
+    { "FS", "\xcd\x7b\xbe\x18\xd6\x13\x0b\x28\xf6\x2f\x19\xfa\x79\x45\x53\x5b", fs_kip_patches_200 },
+    { "FS", "\xe7\x66\x92\xdf\xaa\x04\x20\xe9\xfd\xd6\x8e\x43\x63\x16\x18\x18", fs_kip_patches_200 },
+    { "FS", "\x0d\x70\x05\x62\x7b\x07\x76\x7c\x0b\x96\x3f\x9a\xff\xdd\xe5\x66", fs_kip_patches_210 },
+    { "FS", "\xdb\xd8\x5f\xca\xcc\x19\x3d\xa8\x30\x51\xc6\x64\xe6\x45\x2d\x32", fs_kip_patches_210 },
+    { "FS", "\xa8\x6d\xa5\xe8\x7e\xf1\x09\x7b\x23\xda\xb5\xb4\xdb\xba\xef\xe7", fs_kip_patches_300 },
+    { "FS", "\x98\x1c\x57\xe7\xf0\x2f\x70\xf7\xbc\xde\x75\x31\x81\xd9\x01\xa6", fs_kip_patches_300 },
+    { "FS", "\x57\x39\x7c\x06\x3f\x10\xb6\x31\x3f\x4d\x83\x76\x53\xcc\xc3\x71", fs_kip_patches_301 },
+    { "FS", "\x07\x30\x99\xd7\xc6\xad\x7d\x89\x83\xbc\x7a\xdd\x93\x2b\xe3\xd1", fs_kip_patches_301 },
+    { "FS", "\x06\xe9\x07\x19\x59\x5a\x01\x0c\x62\x46\xff\x70\x94\x6f\x10\xfb", fs_kip_patches_401 },
+    { "FS", "\x54\x9b\x0f\x8d\x6f\x72\xc4\xe9\xf3\xfd\x1f\x19\xea\xce\x4a\x5a", fs_kip_patches_401 },
+    { "FS", "\x80\x96\xaf\x7c\x6a\x35\xaa\x82\x71\xf3\x91\x69\x95\x41\x3b\x0b", fs_kip_patches_410 },
+    { "FS", "\x02\xd5\xab\xaa\xfd\x20\xc8\xb0\x63\x3a\xa0\xdb\xae\xe0\x37\x7e", fs_kip_patches_410 },
+    { "FS", "\xa6\xf2\x7a\xd9\xac\x7c\x73\xad\x41\x9b\x63\xb2\x3e\x78\x5a\x0c", fs_kip_patches_500 },
+    { "FS", "\xce\x3e\xcb\xa2\xf2\xf0\x62\xf5\x75\xf8\xf3\x60\x84\x2b\x32\xb4", fs_kip_patches_500 },
+    { "FS", "\x76\xf8\x74\x02\xc9\x38\x7c\x0f\x0a\x2f\xab\x1b\x45\xce\xbb\x93", fs_kip_patches_510 },
+    { "FS", "\x10\xb2\xd8\x16\x05\x48\x85\x99\xdf\x22\x42\xcb\x6b\xac\x2d\xf1", fs_kip_patches_510 },
+    { NULL, NULL, NULL },
 };

 int kippatch_apply(u8 *kipdata, u64 kipdata_len, kippatch_t *patch) {
@@ -61,6 +65,25 @@ int kippatch_apply(u8 *kipdata, u64 kipdata_len, kippatch_t *patch) {
    return 0;
 }

+
+int nca_patch(u8 * kipdata, u64 kipdata_len) {
+	char pattern[8] = {0xE5, 0x07, 0x00, 0x32, 0xE0, 0x03, 0x16, 0xAA};
+	char buf[0x10];
+	memcpy(buf, kipdata+0x1C450, 0x10);
+	u32 * addr = memsearch(kipdata, kipdata_len, pattern, sizeof(pattern));
+	int ret=0;
+	int max_dist = 0x10;
+	for(int i=0; i<max_dist; i++) {
+		u32 op = addr[i];
+		if((op & 0xFC000000)==0x94000000) { //is a BL op
+			addr[i] = NOP;
+			ret=1;
+			break;
+		}
+	}
+	return ret;
+}
+
 int kippatch_apply_set(u8 *kipdata, u64 kipdata_len, kippatchset_t *patchset, char **filter) {
    for (kippatch_t *p = patchset->patches; p && p->name; ++p) {
        int found = 0;
@@ -70,18 +93,14 @@ int kippatch_apply_set(u8 *kipdata, u64 kipdata_len, kippatchset_t *patchset, ch
                break;
            }
        }
-        if (!strcmp(p->name, "nogc")){
-            if(!fopen("/ReiNX/nogc", "rb")) {
-                fclose();
-                continue;
-            }
-        }
+
        if (filter && !found) continue;

        int r = kippatch_apply(kipdata, kipdata_len, p);
        if (r) return r;
    }
-
+	if(!strncmp("FS", patchset->kip_name, 2))
+		nca_patch(kipdata, kipdata_len);
    return 0;
 }

diff --git a/src/kippatches/fs.inc b/src/kippatches/fs.inc
@@ -89,13 +89,13 @@ static kipdiff_t fs_diffs_401_nocmac[6] = {

 static kipdiff_t fs_diffs_401_nogc[3] = {
  { 0xA3458, 4, "\x14\x40\x80\x72", "\x14\x80\x80\x72" },
-  { 0xAAC98, 8, "\x80\x02\xA0\x52\x40\x40\x91\x72", "\xE0\x03\x1F\x2A\x1F\x20\x03\xD5" },
+  { 0xAAB44, 8, "\xF4\x4F\xBE\xA9\xFD\x7B\x01\xA9", "\xE0\x03\x1F\x2A\xC0\x03\x5F\xD6" },
  { 0, 0, NULL, NULL },
 };

 static kipdiff_t fs_diffs_410_nogc[3] = {
  { 0xA34BC, 4, "\x14\x40\x80\x72", "\x14\x80\x80\x72" },
-  { 0xAACFC, 8, "\x80\x02\xA0\x52\x40\x40\x91\x72", "\xE0\x03\x1F\x2A\x1F\x20\x03\xD5" },
+  { 0xAABA8, 8, "\xF4\x4F\xBE\xA9\xFD\x7B\x01\xA9", "\xE0\x03\x1F\x2A\xC0\x03\x5F\xD6" },
  { 0, 0, NULL, NULL },
 };

@@ -118,7 +118,7 @@ static kipdiff_t fs_diffs_500_nocmac[8] = {

 static kipdiff_t fs_diffs_500_nogc[3] = {
  { 0xCF3C4, 4, "\x14\x40\x80\x52", "\x14\x80\x80\x52" },
-  { 0xD74FC, 8, "\x40\x40\x91\x52\x80\x02\xA0\x72", "\xE0\x03\x1F\x2A\x1F\x20\x03\xD5" },
+  { 0xD73A0, 8, "\xF4\x4F\xBE\xA9\xFD\x7B\x01\xA9", "\xE0\x03\x1F\x2A\xC0\x03\x5F\xD6" },
  { 0, 0, NULL, NULL },
 };

@@ -141,7 +141,7 @@ static kipdiff_t fs_diffs_510_nocmac[8] = {

 static kipdiff_t fs_diffs_510_nogc[3] = {
  { 0xCF794, 4, "\x14\x40\x80\x52", "\x14\x80\x80\x52" },
-  { 0xD78CC, 8, "\x40\x40\x91\x52\x80\x02\xA0\x72", "\xE0\x03\x1F\x2A\x1F\x20\x03\xD5" },
+  { 0xD7770, 8, "\xF4\x4F\xBE\xA9\xFD\x7B\x01\xA9", "\xE0\x03\x1F\x2A\xC0\x03\x5F\xD6" },
  { 0, 0, NULL, NULL },
 };
+1 −0		.gitignore
+1 −2		loader/source/ldr_main.cpp
+11 −1		loader/source/ldr_npdm.cpp
+11 −1		loader/source/ldr_nso.cpp