add args to override specific KELF header data

Author: israpps

src/kelf.cpp

@@ -84,6 +84,11 @@ void xor_bit(const void *a, const void *b, void *Result, size_t Length)
     }
 }
 
+extern uint8_t GSystemtype;
+extern uint8_t GMGZones;
+extern uint16_t GFlags;
+extern uint8_t GApplicationType;
+
 int Kelf::LoadKelf(const std::string &filename)
 {
     FILE *f = fopen(filename.c_str(), "rb");
@@ -390,11 +395,11 @@ int Kelf::SaveKelf(const std::string &filename, int headerid)
     memcpy(header.UserDefined, USER_HEADER, 16);
     header.ContentSize     = Content.size();      // sometimes zero
     header.HeaderSize      = bitTable.HeaderSize; // header + header signature + kbit + kc + bittable + bittable signature + root signature
-    header.SystemType      = SYSTEM_TYPE_PS2;     // same for COH (arcade)
-    header.ApplicationType = 1;                   // 1 = xosdmain, 5 = dvdplayer kirx 7 = dvdplayer kelf 0xB - ?? 0x00 - ??
+    header.SystemType      = GSystemtype;         // same for COH (arcade)
+    header.ApplicationType = GApplicationType;    // 1 = xosdmain, 5 = dvdplayer kirx 7 = dvdplayer kelf 0xB - ?? 0x00 - ??
     // TODO: implement and check 3DES/1DES difference based on header.Flags. In both - encryption and decryption.
-    header.Flags    = HDR_PREDEF_KELF; // ?? 00000010 00101100 binary, 0x021C for kirx
-    header.MGZones  = 0xFF;   // region bit, 1 - allowed
+    header.Flags    = GFlags;   // ?? 00000010 00101100 binary, 0x021C for kirx
+    header.MGZones  = GMGZones; // region bit, 1 - allowed
     header.BitCount = 0;
     // ?? balika, wisi: strange value, represents number of blacklisted iLinkID, ConsoleID
     // iLinkID (8 bytes), consoleID (8 bytes) placed between header.MGZones and HeaderSignature

src/kelftool.cpp

@@ -20,6 +20,11 @@
 #include "keystore.h"
 #include "kelf.h"
 
+uint8_t GSystemtype = SYSTEM_TYPE_PS2;
+uint8_t GMGZones = REGION_ALL_ALLOWED;
+uint16_t GFlags = HDR_PREDEF_KELF;
+uint8_t GApplicationType = KELFTYPE_XOSDMAIN;
+
 // TODO: implement load/save kelf header configuration for byte-perfect encryption, decryption
 
 std::string getKeyStorePath()
@@ -89,6 +94,41 @@ int encrypt(int argc, char **argv)
         if (!strncmp("--keys=", argv[x], strlen("--keys="))) {
             printf("- Custom keyset %s\n", &argv[x][7]);
             KeyStoreEntry = &argv[x][7];
+        } else if (!strncmp("--systemtype=", argv[x], strlen("--systemtype="))) {
+            const char* a = &argv[x][13];
+            long t;
+            if (!strcmp(a, "PS2")) {
+                GSystemtype = SYSTEM_TYPE_PS2;
+            } else if (!strcmp(a, "PSX")) {
+                GSystemtype = SYSTEM_TYPE_PSX;
+            } else if ((t = strtoul(a, NULL, 10)) <= std::numeric_limits<std::uint8_t>::max()) {
+                GSystemtype = (uint8_t)t;
+            }
+        } else if (!strncmp("--kflags=", argv[x], strlen("--kflags="))) {
+            const char* a = &argv[x][9];
+            unsigned long t;
+            if (!strcmp(a, "KELF")) {
+                GFlags = HDR_PREDEF_KELF;
+            } else if (!strcmp(a, "KIRX")) {
+                GFlags = HDR_PREDEF_KIRX;
+            } else if ((t = strtoul(a, NULL, 16)) <= std::numeric_limits<std::uint16_t>::max()) {
+                GFlags = (uint16_t)t;
+                if ((GFlags & HDR_FLAG4_1DES) && (GFlags & HDR_FLAG4_3DES)) {
+                    printf("WARNING: 0x%x specifies both Single and Triple DES. only one should be defined\n", GFlags);
+                }
+            }
+        } else if (!strncmp("--mgzone=", argv[x], strlen("--mgzone="))) {
+            const char* a = &argv[x][9];
+            long t;
+            if ((t = strtoul(a, NULL, 16))<std::numeric_limits<std::uint8_t>::max()) {
+                GMGZones = (uint8_t)t;
+            }
+        } else if (!strncmp("--apptype=", argv[x], strlen("--apptype="))) {
+            const char* a = &argv[x][10];
+            long t;
+            if ((t = strtoul(a, NULL, 16)) <= std::numeric_limits<std::uint8_t>::max()) {
+                GApplicationType = (uint8_t)t;
+            }
         }
     }