add dnasload user header

a

Author: israpps

src/kelf.cpp

@@ -366,18 +366,22 @@ int Kelf::SaveKelf(const std::string &filename, int headerid)
     static uint8_t *USER_HEADER;
 
     switch (headerid) {
-        case 0:
+        case HEADER::FMCB:
             USER_HEADER = USER_HEADER_FMCB;
             break;
 
-        case 1:
+        case HEADER::FHDB:
             USER_HEADER = USER_HEADER_FHDB;
             break;
 
-        case 2:
+        case HEADER::MBR:
             USER_HEADER = USER_HEADER_MBR;
             break;
 
+        case HEADER::DNASLOAD:
+            USER_HEADER = USER_HEADER_DNASLOAD;
+            break;
+
         default:
             USER_HEADER = USER_HEADER_FHDB;
             break;
@@ -451,15 +455,19 @@ int Kelf::LoadContent(const std::string &filename, int headerid)
     // TODO: encrypted Kbit hold some useful data
     static uint8_t *USER_Kbit;
     switch (headerid) {
-        case 0:
+        case HEADER::FMCB:
+        case HEADER::DNASLOAD:
             USER_Kbit = USER_Kbit_FMCB;
             break;
-        case 1:
+
+        case HEADER::FHDB:
             USER_Kbit = USER_Kbit_FHDB;
             break;
-        case 2:
+
+        case HEADER::MBR:
             USER_Kbit = USER_Kbit_MBR;
             break;
+
         default:
             USER_Kbit = USER_Kbit_FHDB;
             break;

src/kelf.h

@@ -30,9 +30,18 @@
 #define SYSTEM_TYPE_PS2 0 // same for COH (arcade)
 #define SYSTEM_TYPE_PSX 1
 
+enum HEADER {
+    INVALID = -1,
+    FMCB = 0,
+    FHDB,
+    MBR,
+    DNASLOAD,
+};
+
 static uint8_t USER_HEADER_FMCB[16] = {0x01, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x4A, 0x00, 0x01, 0x02, 0x19, 0x00, 0x00, 0x00, 0x56};
 static uint8_t USER_HEADER_FHDB[16] = {0x01, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x4A, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1B};
 static uint8_t USER_HEADER_MBR[16]  = {0x01, 0x00, 0x00, 0x04, 0x00, 0x02, 0x01, 0x57, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A};
+static uint8_t USER_HEADER_DNASLOAD[16]  = {0x01, 0x00, 0x00, 0x04, 0x00, 0x06, 0x00, 0x4A, 0x00, 0x0E, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02};
 
 static uint8_t USER_HEADER_NAMCO_SECURITY_DONGLE_BOOTFILE[16]  = {0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00};
 

src/kelftool.cpp

@@ -93,15 +93,18 @@ int encrypt(int argc, char **argv)
     }
 
     if (strcmp("fmcb", argv[1]) == 0)
-        headerid = 0;
+        headerid = HEADER::FMCB;
 
     if (strcmp("fhdb", argv[1]) == 0)
-        headerid = 1;
+        headerid = HEADER::FHDB;
 
     if (strcmp("mbr", argv[1]) == 0)
-        headerid = 2;
+        headerid = HEADER::MBR;
 
-    if (headerid == -1) {
+    if (strcmp("dnasload", argv[1]) == 0)
+        headerid = HEADER::DNASLOAD;
+
+    if (headerid == HEADER::INVALID) {
 
         printf("Invalid header: %s\n", argv[1]);
         return -1;
@@ -141,12 +144,13 @@ int main(int argc, char **argv)
         printf("Available submodules:\n");
         printf("\tdecrypt - decrypt and check signature of kelf files\n");
         printf("\tencrypt <headerid> - encrypt and sign kelf files <headerid>: fmcb, fhdb, mbr\n");
-        printf("\t\tfmcb - for retail PS2 memory cards\n");
-        printf("\t\tfhdb - for retail PS2 HDD (HDD OSD / BB Navigator)\n");
-        printf("\t\tmbr  - for retail PS2 HDD (mbr injection).\n");
-        printf("\t\t       Note: for mbr elf should load from 0x100000 and should be without headers:\n");
-        printf("\t\t       readelf -h <input_elf> should show 0x100000 or 0x100008\n");
-        printf("\t\t       $(EE_OBJCOPY) -O binary -v <input_elf> <headerless_elf>\n");
+        printf("\t\tfmcb     - for retail PS2 memory cards\n");
+        printf("\t\tdnasload - for retail PS2 memory cardsfor retail PS2 memory cards (PSX Whitelist)\n");
+        printf("\t\tfhdb     - for retail PS2 HDD (HDD OSD / BB Navigator)\n");
+        printf("\t\tmbr      - for retail PS2 HDD (mbr injection).\n");
+        printf("\t\t           Note: for mbr elf should load from 0x100000 and should be without headers:\n");
+        printf("\t\t           readelf -h <input_elf> should show 0x100000 or 0x100008\n");
+        printf("\t\t           $(EE_OBJCOPY) -O binary -v <input_elf> <headerless_elf>\n");
         return -1;
     }