small updates to hf mf restore1k

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 0c61542b962d566afb74c229b281c462237f24c0..cd50477d9be9ec1e7448192c3a5b8e53f79854ed 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -403,8 +403,6 @@ int CmdHF14AMfRestore1k(const char *Cmd)
        FILE *fdump;\r
        FILE *fkeys;\r
        \r
        FILE *fdump;\r
        FILE *fkeys;\r
        \r

-       char ch;\r
-       \r

        if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
                PrintAndLog("Could not find file dump.bin");\r
                return 1;\r
        if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
                PrintAndLog("Could not find file dump.bin");\r
                return 1;\r


@@ -445,13 +443,17 @@ int CmdHF14AMfRestore1k(const char *Cmd)
                                bldata[15] = (keyB[i][5]);\r
                        }               \r
                        \r
                                bldata[15] = (keyB[i][5]);\r
                        }               \r
                        \r

+                       PrintAndLog("Writing to block %2d: %s", i*4+j, sprint_hex(bldata, 16));\r
+                       \r
+                       /*\r

                        PrintAndLog("Writing to block %2d: %s Confirm? [Y,N]", i*4+j, sprint_hex(bldata, 16));\r
                        \r
                        scanf("%c",&ch);\r
                        PrintAndLog("Writing to block %2d: %s Confirm? [Y,N]", i*4+j, sprint_hex(bldata, 16));\r
                        \r
                        scanf("%c",&ch);\r

-                       if ((ch != 'y') || (ch != 'Y')){\r
+                       if ((ch != 'y') && (ch != 'Y')){\r

                                PrintAndLog("Aborting !");\r
                                return 1;\r
                        }\r
                                PrintAndLog("Aborting !");\r
                                return 1;\r
                        }\r

+                       */\r

                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r