X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f8ada309e9e521b0e57f67fad111ae1500b660f4..3a532acfe14cf8be11f1f4b26685acbef33a6595:/client/cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d43a0ef2..267f323c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -988,6 +988,7 @@ int CmdHF14AMfChk(const char *Cmd)
break;
default:
PrintAndLog("Key type must be A , B or ?");
+ free(keyBlock);
return 1;
};
@@ -1039,6 +1040,7 @@ int CmdHF14AMfChk(const char *Cmd)
if (!p) {
PrintAndLog("Cannot allocate memory for defKeys");
free(keyBlock);
+ free(f);
return 2;
}
keyBlock = p;
@@ -1195,15 +1197,21 @@ int CmdHF14AMf1kSim(const char *Cmd)
if(flags & FLAG_INTERACTIVE)
{
- PrintAndLog("Press pm3-button to abort simulation");
-
uint8_t data[40];
uint8_t key[6];
UsbCommand resp;
+ PrintAndLog("Press pm3-button or send another cmd to abort simulation");
+ //while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ //We're waiting only 1.5 s at a time, otherwise we get the
+ // annoying message about "Waiting for a response... "
+ //}
while(!ukbhit() ){
- if ( WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
- if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
+ if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) continue;
+
+ if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
+ if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+
memset(data, 0x00, sizeof(data));
memset(key, 0x00, sizeof(key));
int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
@@ -1213,23 +1221,21 @@ int CmdHF14AMf1kSim(const char *Cmd)
uint64_t corr_uid = 0;
if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {
corr_uid = (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0];
- }
- else {
+ tryMfk32(corr_uid, data, key);
+ } else {
corr_uid |= (uint64_t)data[2] << 48;
corr_uid |= (uint64_t)data[1] << 40;
corr_uid |= (uint64_t)data[0] << 32;
- corr_uid |= data[7] << 24;
- corr_uid |= data[6] << 16;
- corr_uid |= data[5] << 8;
- corr_uid |= data[4];
+ corr_uid |= (uint64_t)data[7] << 24;
+ corr_uid |= (uint64_t)data[6] << 16;
+ corr_uid |= (uint64_t)data[5] << 8;
+ corr_uid |= (uint64_t)data[4];
+ tryMfk64(corr_uid, data, key);
}
- tryMfk32(corr_uid, data, key);
- //tryMfk64(corr_uid, data, key);
PrintAndLog("--");
}
}
- }
- }
+
return 0;
}
@@ -1334,7 +1340,7 @@ int CmdHF14AMfELoad(const char *Cmd)
if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {
PrintAndLog("It loads emul dump from the file `filename.eml`");
- PrintAndLog("Usage: hf mf eload [card memory] <file name w/o `.eml`>");
+ PrintAndLog("Usage: hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");
PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");
PrintAndLog("");
PrintAndLog(" sample: hf mf eload filename");
@@ -1348,17 +1354,19 @@ int CmdHF14AMfELoad(const char *Cmd)
case '\0': numBlocks = 16*4; break;
case '2' : numBlocks = 32*4; break;
case '4' : numBlocks = 256; break;
- case 'U' : // fall through , NTAG 215 has 135blocks a 540 bytes.
- case 'u' : numBlocks = 135; blockWidth = 8; break;
+ case 'U' : // fall through
+ case 'u' : numBlocks = 255; blockWidth = 8; break;
default: {
numBlocks = 16*4;
nameParamNo = 0;
}
}
+ uint32_t numblk2 = param_get32ex(Cmd,2,0,10);
+ if (numblk2 > 0) numBlocks = numblk2;
len = param_getstr(Cmd,nameParamNo,filename);
- if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
+ if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
fnameptr += len;
@@ -1455,7 +1463,7 @@ int CmdHF14AMfESave(const char *Cmd)
len = param_getstr(Cmd,nameParamNo,filename);
- if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
+ if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
// user supplied filename?
if (len < 1) {
@@ -1732,7 +1740,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
return 0;
} else {
len = strlen(Cmd);
- if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
+ if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
memcpy(filename, Cmd, len);
fnameptr += len;
@@ -1816,7 +1824,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
return 1;
}
- PrintAndLog("data:%s", sprint_hex(data, sizeof(data)));
+ PrintAndLog("data: %s", sprint_hex(data, sizeof(data)));
return 0;
}
@@ -1902,7 +1910,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
return 0;
} else {
len = strlen(Cmd);
- if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;
+ if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;
// get filename based on UID
if (len < 1) {
@@ -2021,7 +2029,10 @@ int CmdHF14AMfSniff(const char *Cmd){
uint16_t traceLen = resp.arg[1];
len = resp.arg[2];
- if (res == 0) return 0; // we are done
+ if (res == 0) {
+ free(buf);
+ return 0; // we are done
+ }
if (res == 1) { // there is (more) data to be transferred
if (pckNum == 0) { // first packet, (re)allocate necessary buffer
@@ -2043,6 +2054,11 @@ int CmdHF14AMfSniff(const char *Cmd){
bufsize = traceLen;
memset(buf, 0x00, traceLen);
}
+ if (bufPtr == NULL) {
+ PrintAndLog("Cannot allocate memory for trace");
+ free(buf);
+ return 2;
+ }
memcpy(bufPtr, resp.d.asBytes, len);
bufPtr += len;
pckNum++;
@@ -2119,48 +2135,46 @@ int CmdHf14MfDecryptBytes(const char *Cmd){
return tryDecryptWord( nt, ar_enc, at_enc, data, len);
}
-static command_t CommandTable[] =
-{
- {"help", CmdHelp, 1, "This help"},
- {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"},
- {"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"},
- {"rdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"},
- {"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"},
- {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"},
- {"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"},
- {"chk", CmdHF14AMfChk, 0, "Test block keys"},
- {"mifare", CmdHF14AMifare, 0, "Read parity error messages."},
- {"nested", CmdHF14AMfNested, 0, "Test nested authentication"},
+static command_t CommandTable[] = {
+ {"help", CmdHelp, 1, "This help"},
+ {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"},
+ {"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"},
+ {"rdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"},
+ {"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"},
+ {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"},
+ {"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"},
+ {"chk", CmdHF14AMfChk, 0, "Test block keys"},
+ {"mifare", CmdHF14AMifare, 0, "Read parity error messages."},
+ {"nested", CmdHF14AMfNested, 0, "Test nested authentication"},
{"hardnested", CmdHF14AMfNestedHard, 0, "Nested attack for hardened Mifare cards"},
- {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"},
- {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"},
- {"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"},
- {"eget", CmdHF14AMfEGet, 0, "Get simulator memory block"},
- {"eset", CmdHF14AMfESet, 0, "Set simulator memory block"},
- {"eload", CmdHF14AMfELoad, 0, "Load from file emul dump"},
- {"esave", CmdHF14AMfESave, 0, "Save to file emul dump"},
- {"ecfill", CmdHF14AMfECFill, 0, "Fill simulator memory with help of keys from simulator"},
- {"ekeyprn", CmdHF14AMfEKeyPrn, 0, "Print keys from simulator memory"},
- {"csetuid", CmdHF14AMfCSetUID, 0, "Set UID for magic Chinese card"},
- {"csetblk", CmdHF14AMfCSetBlk, 0, "Write block - Magic Chinese card"},
- {"cgetblk", CmdHF14AMfCGetBlk, 0, "Read block - Magic Chinese card"},
- {"cgetsc", CmdHF14AMfCGetSc, 0, "Read sector - Magic Chinese card"},
- {"cload", CmdHF14AMfCLoad, 0, "Load dump into magic Chinese card"},
- {"csave", CmdHF14AMfCSave, 0, "Save dump from magic Chinese card into file or emulator"},
- {"decrypt", CmdHf14MfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
- {NULL, NULL, 0, NULL}
+ {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"},
+ {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"},
+ {"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"},
+ {"eget", CmdHF14AMfEGet, 0, "Get simulator memory block"},
+ {"eset", CmdHF14AMfESet, 0, "Set simulator memory block"},
+ {"eload", CmdHF14AMfELoad, 0, "Load from file emul dump"},
+ {"esave", CmdHF14AMfESave, 0, "Save to file emul dump"},
+ {"ecfill", CmdHF14AMfECFill, 0, "Fill simulator memory with help of keys from simulator"},
+ {"ekeyprn", CmdHF14AMfEKeyPrn, 0, "Print keys from simulator memory"},
+ {"csetuid", CmdHF14AMfCSetUID, 0, "Set UID for magic Chinese card"},
+ {"csetblk", CmdHF14AMfCSetBlk, 0, "Write block - Magic Chinese card"},
+ {"cgetblk", CmdHF14AMfCGetBlk, 0, "Read block - Magic Chinese card"},
+ {"cgetsc", CmdHF14AMfCGetSc, 0, "Read sector - Magic Chinese card"},
+ {"cload", CmdHF14AMfCLoad, 0, "Load dump into magic Chinese card"},
+ {"csave", CmdHF14AMfCSave, 0, "Save dump from magic Chinese card into file or emulator"},
+ {"decrypt", CmdHf14MfDecryptBytes, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},
+ {NULL, NULL, 0, NULL}
};
-int CmdHFMF(const char *Cmd)
-{
+int CmdHFMF(const char *Cmd) {
// flush
- WaitForResponseTimeout(CMD_ACK,NULL,100);
+ clearCommandBuffer();
+ //WaitForResponseTimeout(CMD_ACK,NULL,100);
CmdsParse(CommandTable, Cmd);
return 0;
}
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
CmdsHelp(CommandTable);
return 0;
}