X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3d77fdfab52f8837dbd704f5d9efe4bafa057285..e4da8ed0bbcd6352a3aba257b084849443882e59:/client/cmdhfmf.c diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 9bfa055b..1a29f871 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -259,15 +259,10 @@ int CmdHF14AMfDump1k(const char *Cmd) { int i, j; - uint8_t keyType = 0; - uint8_t c[3][4]; uint8_t keyA[16][6]; uint8_t keyB[16][6]; uint8_t rights[16][4]; - uint8_t isOK = 0; - uint8_t *data = NULL; - FILE *fin; FILE *fout; @@ -419,7 +414,7 @@ int CmdHF14AMfRestore1k(const char *Cmd) fread(keyB[i], 1, 6, fkeys); } - PrintAndLog("going..."); + PrintAndLog("Restoring dumpdata.bin to card"); for (i=0 ; i<16 ; i++) { for( j=0 ; j<4 ; j++) { @@ -443,7 +438,17 @@ int CmdHF14AMfRestore1k(const char *Cmd) bldata[15] = (keyB[i][5]); } - PrintAndLog("writing to block %2d: %s confirm?", i*4+j, sprint_hex(bldata, 16)); + PrintAndLog("Writing to block %2d: %s", i*4+j, sprint_hex(bldata, 16)); + + /* + PrintAndLog("Writing to block %2d: %s Confirm? [Y,N]", i*4+j, sprint_hex(bldata, 16)); + + scanf("%c",&ch); + if ((ch != 'y') && (ch != 'Y')){ + PrintAndLog("Aborting !"); + return 1; + } + */ memcpy(c.d.asBytes + 10, bldata, 16); SendCommand(&c);