X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3bba7deac0b4e1908db70e6a005d275859458c15..refs/pull/117/head:/client/cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d0852ea5..2b5a5b87 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -434,7 +434,7 @@ int CmdHF14AMfRestore(const char *Cmd)
{
uint8_t sectorNo,blockNo;
uint8_t keyType = 0;
- uint8_t key[6] = {0xFF};
+ uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
uint8_t bldata[16] = {0x00};
uint8_t keyA[40][6];
uint8_t keyB[40][6];
@@ -547,7 +547,7 @@ int CmdHF14AMfNested(const char *Cmd)
uint8_t trgKeyType = 0;
uint8_t SectorsCnt = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
- uint8_t keyBlock[13*6];
+ uint8_t keyBlock[14*6];
uint64_t key64 = 0;
bool transferToEml = false;
@@ -1200,7 +1200,7 @@ int CmdHF14AMfELoad(const char *Cmd)
len = param_getstr(Cmd,nameParamNo,filename);
- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
fnameptr += len;
@@ -1299,17 +1299,20 @@ int CmdHF14AMfESave(const char *Cmd)
len = param_getstr(Cmd,nameParamNo,filename);
- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
// user supplied filename?
if (len < 1) {
// get filename (UID from memory)
if (mfEmlGetMem(buf, 0, 1)) {
PrintAndLog("Can\'t get UID from block: %d", 0);
- sprintf(filename, "dump.eml");
+ len = sprintf(fnameptr, "dump");
+ fnameptr += len;
+ }
+ else {
+ for (j = 0; j < 7; j++, fnameptr += 2)
+ sprintf(fnameptr, "%02X", buf[j]);
}
- for (j = 0; j < 7; j++, fnameptr += 2)
- sprintf(fnameptr, "%02X", buf[j]);
} else {
fnameptr += len;
}
@@ -1499,16 +1502,16 @@ int CmdHF14AMfCSetUID(const char *Cmd)
int CmdHF14AMfCSetBlk(const char *Cmd)
{
- uint8_t uid[8] = {0x00};
uint8_t memBlock[16] = {0x00};
uint8_t blockNo = 0;
+ bool wipeCard = FALSE;
int res;
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
- PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)>");
+ PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)> [w]");
PrintAndLog("sample: hf mf csetblk 1 01020304050607080910111213141516");
- PrintAndLog("Set block data for magic Chinese card (only works with!!!)");
- PrintAndLog("If you want wipe card then add 'w' into command line. \n");
+ PrintAndLog("Set block data for magic Chinese card (only works with such cards)");
+ PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line");
return 0;
}
@@ -1519,14 +1522,15 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
return 1;
}
+ char ctmp = param_getchar(Cmd, 2);
+ wipeCard = (ctmp == 'w' || ctmp == 'W');
PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));
- res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);
+ res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);
if (res) {
- PrintAndLog("Can't write block. error=%d", res);
- return 1;
- }
-
+ PrintAndLog("Can't write block. error=%d", res);
+ return 1;
+ }
return 0;
}
@@ -1539,7 +1543,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
char buf[64] = {0x00};
uint8_t buf8[64] = {0x00};
uint8_t fillFromEmulator = 0;
- int i, len, blockNum, flags;
+ int i, len, blockNum, flags=0;
if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {
PrintAndLog("It loads magic Chinese card from the file `filename.eml`");
@@ -1554,15 +1558,14 @@ int CmdHF14AMfCLoad(const char *Cmd)
if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;
if (fillFromEmulator) {
- flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {
if (mfEmlGetMem(buf8, blockNum, 1)) {
PrintAndLog("Cant get block: %d", blockNum);
return 2;
}
-
- if (blockNum == 2) flags = 0;
- if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+ if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence
+ if (blockNum == 1) flags = 0; // just write
+ if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.
if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
PrintAndLog("Cant set magic card block: %d", blockNum);
@@ -1572,7 +1575,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
return 0;
} else {
len = strlen(Cmd);
- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
memcpy(filename, Cmd, len);
fnameptr += len;
@@ -1587,27 +1590,29 @@ int CmdHF14AMfCLoad(const char *Cmd)
}
blockNum = 0;
- flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
while(!feof(f)){
memset(buf, 0, sizeof(buf));
if (fgets(buf, sizeof(buf), f) == NULL) {
+ fclose(f);
PrintAndLog("File reading error.");
return 2;
}
- if (strlen(buf) < 32){
+ if (strlen(buf) < 32) {
if(strlen(buf) && feof(f))
break;
PrintAndLog("File content error. Block data must include 32 HEX symbols");
+ fclose(f);
return 2;
}
for (i = 0; i < 32; i += 2)
sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);
- if (blockNum == 2) flags = 0;
- if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;
+ if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence
+ if (blockNum == 1) flags = 0; // just write
+ if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.
if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {
PrintAndLog("Can't set magic card block: %d", blockNum);
@@ -1638,7 +1643,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
PrintAndLog("Usage: hf mf cgetblk <block number>");
PrintAndLog("sample: hf mf cgetblk 1");
- PrintAndLog("Get block data from magic Chinese card (only works with!!!)\n");
+ PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");
return 0;
}
@@ -1665,7 +1670,7 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {
PrintAndLog("Usage: hf mf cgetsc <sector number>");
PrintAndLog("sample: hf mf cgetsc 0");
- PrintAndLog("Get sector data from magic Chinese card (only works with!!!)\n");
+ PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");
return 0;
}
@@ -1739,7 +1744,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
return 0;
} else {
len = strlen(Cmd);
- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
if (len < 1) {
// get filename