added functionality: dump card memory, save|load card memory.

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d771c64544424d94a07d8a65eeb83f0fd3a4a48f..b46c33b02831edd5eb671c9e7e852b6f145a5a7f 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -427,7 +427,7 @@ int CmdHF14AMfNested(const char *Cmd)
                        for (i = 0; i < SectorsCnt; i++) {\r
                                mfEmlGetMem(keyBlock, i * 4 + 3, 1);\r
                                if (e_sector[i].foundKey[0])\r
-                                       num_to_bytes(e_sector[i].Key[1], 6, keyBlock);\r
+                                       num_to_bytes(e_sector[i].Key[0], 6, keyBlock);\r
                                if (e_sector[i].foundKey[1])\r
                                        num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r
                                mfEmlSetMem(keyBlock, i * 4 + 3, 1);\r
@@ -617,13 +617,125 @@ int CmdHF14AMfESet(const char *Cmd)
 \r
 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
-       PrintAndLog("No code here (");\r
+       FILE * f;\r
+       char filename[20];\r
+       char * fnameptr = filename;\r
+       char buf[64];\r
+       uint8_t buf8[64];\r
+       int i, len, blockNum;\r
+       \r
+       memset(filename, 0, sizeof(filename));\r
+       memset(buf, 0, sizeof(buf));\r
+\r
+       if (param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("It loads emul dump from the file `filename.eml`");\r
+               PrintAndLog("Usage:  hf mf eload <file name w/o `.eml`>");\r
+               PrintAndLog(" sample: hf mf eload filename");\r
+               return 0;\r
+       }       \r
+\r
+       len = strlen(Cmd);\r
+       if (len > 14) len = 14;\r
+       \r
+       if (len < 1) {\r
+       }\r
+\r
+       memcpy(filename, Cmd, len);\r
+       fnameptr += len;\r
+\r
+       sprintf(fnameptr, ".eml"); \r
+       \r
+       // open file\r
+       f = fopen(filename, "r");\r
+       if (f == NULL) {\r
+               PrintAndLog("File not found or locked.");\r
+               return 1;\r
+       }\r
+       \r
+       blockNum = 0;\r
+       while(!feof(f)){\r
+               memset(buf, 0, sizeof(buf));\r
+               fgets(buf, sizeof(buf), f);\r
+               if (strlen(buf) < 32){\r
+                       PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
+                       return 2;\r
+               }\r
+               for (i = 0; i < 32; i += 2)\r
+                 sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
+//                     PrintAndLog("data[%02d]:%s", blockNum, sprint_hex(buf8, 16));\r
+\r
+               if (mfEmlSetMem(buf8, blockNum, 1)) {\r
+                       PrintAndLog("Cant set emul block: %d", blockNum);\r
+                       return 3;\r
+               }\r
+               blockNum++;\r
+               \r
+               if (blockNum >= 16 * 4) break;\r
+       }\r
+       fclose(f);\r
+       \r
+       if (blockNum != 16 * 4){\r
+               PrintAndLog("File content error. There must be 64 blocks");\r
+               return 4;\r
+       }\r
+       PrintAndLog("Loaded from file: %s", filename);\r
   return 0;\r
 }\r
 \r
 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
-       PrintAndLog("No code here (");\r
+       FILE * f;\r
+       char filename[20];\r
+       char * fnameptr = filename;\r
+       uint8_t buf[64];\r
+       int i, j, len;\r
+       \r
+       memset(filename, 0, sizeof(filename));\r
+       memset(buf, 0, sizeof(buf));\r
+\r
+       if (param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`");\r
+               PrintAndLog("Usage:  hf mf esave [file name w/o `.eml`]");\r
+               PrintAndLog(" sample: hf mf esave ");\r
+               PrintAndLog("         hf mf esave filename");\r
+               return 0;\r
+       }       \r
+\r
+       len = strlen(Cmd);\r
+       if (len > 14) len = 14;\r
+       \r
+       if (len < 1) {\r
+               // get filename\r
+               if (mfEmlGetMem(buf, 0, 1)) {\r
+                       PrintAndLog("Cant get block: %d", 0);\r
+                       return 1;\r
+               }\r
+               for (j = 0; j < 7; j++, fnameptr += 2)\r
+                       sprintf(fnameptr, "%02x", buf[j]); \r
+       } else {\r
+               memcpy(filename, Cmd, len);\r
+               fnameptr += len;\r
+       }\r
+\r
+       sprintf(fnameptr, ".eml"); \r
+       \r
+       // open file\r
+       f = fopen(filename, "w+");\r
+\r
+       // put hex\r
+       for (i = 0; i < 16 * 4; i++) {\r
+               if (mfEmlGetMem(buf, i, 1)) {\r
+                       PrintAndLog("Cant get block: %d", i);\r
+                       break;\r
+               }\r
+               for (j = 0; j < 16; j++)\r
+                       fprintf(f, "%02x", buf[j]); \r
+               fprintf(f,"\n");\r
+       }\r
+       fclose(f);\r
+       \r
+       PrintAndLog("Saved to file: %s", filename);\r
+       \r
   return 0;\r
 }\r
 \r