X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ac14bee321a52c588038b02bfe69d208a31a70ba..ae7aa73dd529b84ad75c7a3c75461be1d7c18454:/client/cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index b4450d54..a2665256 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------------
-// Copyright (C) 2011 Merlok
+// Copyright (C) 2011,2012 Merlok
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
@@ -9,41 +9,37 @@
//-----------------------------------------------------------------------------
#include "cmdhfmf.h"
-#include "proxmark3.h"
static int CmdHelp(const char *Cmd);
int CmdHF14AMifare(const char *Cmd)
{
uint32_t uid = 0;
- uint32_t nt = 0;
+ uint32_t nt = 0, nr = 0;
uint64_t par_list = 0, ks_list = 0, r_key = 0;
uint8_t isOK = 0;
uint8_t keyBlock[8] = {0};
- if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {
- PrintAndLog("Nt must include 8 HEX symbols");
- return 1;
- }
+ UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};
+
+ // message
+ printf("-------------------------------------------------------------------------\n");
+ printf("Executing command. Expected execution time: 25sec on average :-)\n");
+ printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
+ printf("-------------------------------------------------------------------------\n");
- UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};
start:
- SendCommand(&c);
+ clearCommandBuffer();
+ SendCommand(&c);
//flush queue
while (ukbhit()) getchar();
- // message
- printf("-------------------------------------------------------------------------\n");
- printf("Executing command. It may take up to 30 min.\n");
- printf("Press the key on proxmark3 device to abort proxmark3.\n");
- printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
- printf("-------------------------------------------------------------------------\n");
// wait cycle
while (true) {
- printf(".");
+ printf(".");
fflush(stdout);
if (ukbhit()) {
getchar();
@@ -51,39 +47,44 @@ start:
break;
}
- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 2000);
- if (resp != NULL) {
- isOK = resp->arg[0] & 0xff;
-
- uid = (uint32_t)bytes_to_num(resp->d.asBytes + 0, 4);
- nt = (uint32_t)bytes_to_num(resp->d.asBytes + 4, 4);
- par_list = bytes_to_num(resp->d.asBytes + 8, 8);
- ks_list = bytes_to_num(resp->d.asBytes + 16, 8);
-
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+ isOK = resp.arg[0] & 0xff;
+ uid = (uint32_t)bytes_to_num(resp.d.asBytes + 0, 4);
+ nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4);
+ par_list = bytes_to_num(resp.d.asBytes + 8, 8);
+ ks_list = bytes_to_num(resp.d.asBytes + 16, 8);
+ nr = bytes_to_num(resp.d.asBytes + 24, 4);
printf("\n\n");
- PrintAndLog("isOk:%02x", isOK);
if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");
break;
}
}
+
printf("\n");
// error
if (isOK != 1) return 1;
// execute original function from util nonce2key
- if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2;
- printf("------------------------------------------------------------------\n");
- PrintAndLog("Key found:%012llx \n", r_key);
+ if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key))
+ {
+ isOK = 2;
+ PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
+ } else {
+ printf("------------------------------------------------------------------\n");
+ PrintAndLog("Key found:%012"llx" \n", r_key);
- num_to_bytes(r_key, 6, keyBlock);
- isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
+ num_to_bytes(r_key, 6, keyBlock);
+ isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
+ }
if (!isOK)
- PrintAndLog("Found valid key:%012llx", r_key);
+ PrintAndLog("Found valid key:%012"llx, r_key);
else
{
- PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);
- c.arg[0] = nt;
+ if (isOK != 2) PrintAndLog("Found invalid key. ");
+ PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
+ c.arg[0] = false;
goto start;
}
@@ -127,11 +128,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
memcpy(c.d.asBytes, key, 6);
memcpy(c.d.asBytes + 10, bldata, 16);
SendCommand(&c);
- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
-
- if (resp != NULL) {
- uint8_t isOK = resp->arg[0] & 0xff;
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
PrintAndLog("isOk:%02x", isOK);
} else {
PrintAndLog("Command execute timeout");
@@ -140,6 +140,116 @@ int CmdHF14AMfWrBl(const char *Cmd)
return 0;
}
+int CmdHF14AMfUWrBl(const char *Cmd)
+{
+ uint8_t blockNo = 0;
+ bool chinese_card=0;
+ uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ UsbCommand resp;
+
+ if (strlen(Cmd)<3) {
+ PrintAndLog("Usage: hf mf uwrbl <block number> <block data (8 hex symbols)> <w>");
+ PrintAndLog(" sample: hf mf uwrbl 0 01020304");
+ return 0;
+ }
+
+ blockNo = param_get8(Cmd, 0);
+ if (param_gethex(Cmd, 1, bldata, 8)) {
+ PrintAndLog("Block data must include 8 HEX symbols");
+ return 1;
+ }
+
+ if (strchr(Cmd,'w') != 0) {
+ chinese_card=1;
+ }
+
+ switch(blockNo){
+ case 0:
+ if (!chinese_card){
+ PrintAndLog("Access Denied");
+ }else{
+ PrintAndLog("--specialblock no:%02x", blockNo);
+ PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+ UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
+ memcpy(d.d.asBytes,bldata, 4);
+ SendCommand(&d);
+
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ PrintAndLog("isOk:%02x", isOK);
+ } else {
+ PrintAndLog("Command execute timeout");
+ }
+ }
+ break;
+ case 1:
+ if (!chinese_card){
+ PrintAndLog("Access Denied");
+ }else{
+ PrintAndLog("--specialblock no:%02x", blockNo);
+ PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+ UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
+ memcpy(d.d.asBytes,bldata, 4);
+ SendCommand(&d);
+
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ PrintAndLog("isOk:%02x", isOK);
+ } else {
+ PrintAndLog("Command execute timeout");
+ }
+ }
+ break;
+ case 2:
+ if (!chinese_card){
+ PrintAndLog("Access Denied");
+ }else{
+ PrintAndLog("--specialblock no:%02x", blockNo);
+ PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+ UsbCommand c = {CMD_MIFAREU_WRITEBL, {blockNo}};
+ memcpy(c.d.asBytes, bldata, 4);
+ SendCommand(&c);
+
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ PrintAndLog("isOk:%02x", isOK);
+ } else {
+ PrintAndLog("Command execute timeout");
+ }
+ }
+ break;
+ case 3:
+ PrintAndLog("--specialblock no:%02x", blockNo);
+ PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+ UsbCommand d = {CMD_MIFAREU_WRITEBL, {blockNo}};
+ memcpy(d.d.asBytes,bldata, 4);
+ SendCommand(&d);
+
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ PrintAndLog("isOk:%02x", isOK);
+ } else {
+ PrintAndLog("Command execute timeout");
+ }
+ break;
+ default:
+ PrintAndLog("--block no:%02x", blockNo);
+ PrintAndLog("--data: %s", sprint_hex(bldata, 4));
+ UsbCommand e = {CMD_MIFAREU_WRITEBL, {blockNo}};
+ memcpy(e.d.asBytes,bldata, 4);
+ SendCommand(&e);
+
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ PrintAndLog("isOk:%02x", isOK);
+ } else {
+ PrintAndLog("Command execute timeout");
+ }
+ break;
+ }
+ return 0;
+}
+
int CmdHF14AMfRdBl(const char *Cmd)
{
uint8_t blockNo = 0;
@@ -171,11 +281,11 @@ int CmdHF14AMfRdBl(const char *Cmd)
UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
memcpy(c.d.asBytes, key, 6);
SendCommand(&c);
- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
- if (resp != NULL) {
- uint8_t isOK = resp->arg[0] & 0xff;
- uint8_t * data = resp->d.asBytes;
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ uint8_t * data = resp.d.asBytes;
if (isOK)
PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));
@@ -188,6 +298,129 @@ int CmdHF14AMfRdBl(const char *Cmd)
return 0;
}
+int CmdHF14AMfURdBl(const char *Cmd)
+{
+ uint8_t blockNo = 0;
+
+ if (strlen(Cmd)<1) {
+ PrintAndLog("Usage: hf mf urdbl <block number>");
+ PrintAndLog(" sample: hf mf urdbl 0");
+ return 0;
+ }
+
+ blockNo = param_get8(Cmd, 0);
+ PrintAndLog("--block no:%02x", blockNo);
+
+ UsbCommand c = {CMD_MIFAREU_READBL, {blockNo}};
+ SendCommand(&c);
+
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ uint8_t * data = resp.d.asBytes;
+
+ if (isOK)
+ PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 4));
+ else
+ PrintAndLog("isOk:%02x", isOK);
+ } else {
+ PrintAndLog("Command execute timeout");
+ }
+
+ return 0;
+}
+
+int CmdHF14AMfURdCard(const char *Cmd)
+{
+ int i;
+ uint8_t sectorNo = 0;
+ uint8_t *lockbytes_t=NULL;
+ uint8_t lockbytes[2]={0,0};
+ bool bit[16]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+ uint8_t isOK = 0;
+ uint8_t * data = NULL;
+
+ if (sectorNo > 15) {
+ PrintAndLog("Sector number must be less than 16");
+ return 1;
+ }
+ PrintAndLog("Attempting to Read Ultralight... ");
+
+ UsbCommand c = {CMD_MIFAREU_READCARD, {sectorNo}};
+ SendCommand(&c);
+
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ isOK = resp.arg[0] & 0xff;
+ data = resp.d.asBytes;
+
+ PrintAndLog("isOk:%02x", isOK);
+ if (isOK)
+ for (i = 0; i < 16; i++) {
+ switch(i){
+ case 2:
+ //process lock bytes
+ lockbytes_t=data+(i*4);
+ lockbytes[0]=lockbytes_t[2];
+ lockbytes[1]=lockbytes_t[3];
+ for(int j=0; j<16; j++){
+ bit[j]=lockbytes[j/8] & ( 1 <<(7-j%8));
+ }
+ //PrintAndLog("LB %02x %02x", lockbytes[0],lockbytes[1]);
+ //PrintAndLog("LB2b %02x %02x %02x %02x %02x %02x %02x %02x",bit[8],bit[9],bit[10],bit[11],bit[12],bit[13],bit[14],bit[15]);
+ PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
+ break;
+ case 3:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[4]);
+ break;
+ case 4:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[3]);
+ break;
+ case 5:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[2]);
+ break;
+ case 6:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[1]);
+ break;
+ case 7:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[0]);
+ break;
+ case 8:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[15]);
+ break;
+ case 9:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[14]);
+ break;
+ case 10:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[13]);
+ break;
+ case 11:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[12]);
+ break;
+ case 12:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[11]);
+ break;
+ case 13:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[10]);
+ break;
+ case 14:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[9]);
+ break;
+ case 15:
+ PrintAndLog("Block %02x:%s [%d]", i,sprint_hex(data + i * 4, 4),bit[8]);
+ break;
+ default:
+ PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
+ break;
+ }
+ }
+ } else {
+ PrintAndLog("Command1 execute timeout");
+ }
+ return 0;
+}
+
int CmdHF14AMfRdSc(const char *Cmd)
{
int i;
@@ -226,12 +459,12 @@ int CmdHF14AMfRdSc(const char *Cmd)
UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
memcpy(c.d.asBytes, key, 6);
SendCommand(&c);
- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
PrintAndLog(" ");
- if (resp != NULL) {
- isOK = resp->arg[0] & 0xff;
- data = resp->d.asBytes;
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ isOK = resp.arg[0] & 0xff;
+ data = resp.d.asBytes;
PrintAndLog("isOk:%02x", isOK);
if (isOK)
@@ -242,13 +475,11 @@ int CmdHF14AMfRdSc(const char *Cmd)
PrintAndLog("Command1 execute timeout");
}
- // response2
- resp = WaitForResponseTimeout(CMD_ACK, 500);
+ // response2
PrintAndLog(" ");
-
- if (resp != NULL) {
- isOK = resp->arg[0] & 0xff;
- data = resp->d.asBytes;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ isOK = resp.arg[0] & 0xff;
+ data = resp.d.asBytes;
if (isOK)
for (i = 0; i < 2; i++) {
@@ -272,7 +503,7 @@ int CmdHF14AMfDump(const char *Cmd)
FILE *fin;
FILE *fout;
- UsbCommand *resp;
+ UsbCommand resp;
if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {
PrintAndLog("Could not find file dumpkeys.bin");
@@ -287,10 +518,16 @@ int CmdHF14AMfDump(const char *Cmd)
// Read key file
for (i=0 ; i<16 ; i++) {
- fread ( keyA[i], 1, 6, fin );
+ if (fread( keyA[i], 1, 6, fin ) == 0) {
+ PrintAndLog("File reading error.");
+ return 2;
+ }
}
for (i=0 ; i<16 ; i++) {
- fread ( keyB[i], 1, 6, fin );
+ if (fread( keyB[i], 1, 6, fin ) == 0) {
+ PrintAndLog("File reading error.");
+ return 2;
+ }
}
// Read access rights to sectors
@@ -303,11 +540,10 @@ int CmdHF14AMfDump(const char *Cmd)
UsbCommand c = {CMD_MIFARE_READBL, {4*i + 3, 0, 0}};
memcpy(c.d.asBytes, keyA[i], 6);
SendCommand(&c);
- resp = WaitForResponseTimeout(CMD_ACK, 1500);
- if (resp != NULL) {
- uint8_t isOK = resp->arg[0] & 0xff;
- uint8_t *data = resp->d.asBytes;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ uint8_t *data = resp.d.asBytes;
if (isOK){
rights[i][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);
rights[i][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);
@@ -329,20 +565,23 @@ int CmdHF14AMfDump(const char *Cmd)
PrintAndLog("|----- Dumping all blocks to file... -----|");
PrintAndLog("|-----------------------------------------|");
+
for (i=0 ; i<16 ; i++) {
for (j=0 ; j<4 ; j++) {
- if (j == 3){
+ bool received = false;
+
+ if (j == 3){
UsbCommand c = {CMD_MIFARE_READBL, {i*4 + j, 0, 0}};
memcpy(c.d.asBytes, keyA[i], 6);
SendCommand(&c);
- resp = WaitForResponseTimeout(CMD_ACK, 1500);
+ received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
}
else{
if ((rights[i][j] == 6) | (rights[i][j] == 5)) {
UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 1, 0}};
memcpy(c.d.asBytes, keyB[i], 6);
SendCommand(&c);
- resp = WaitForResponseTimeout(CMD_ACK, 1500);
+ received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
}
else if (rights[i][j] == 7) {
PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);
@@ -351,13 +590,13 @@ int CmdHF14AMfDump(const char *Cmd)
UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 0, 0}};
memcpy(c.d.asBytes, keyA[i], 6);
SendCommand(&c);
- resp = WaitForResponseTimeout(CMD_ACK, 1500);
+ received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
}
}
- if (resp != NULL) {
- uint8_t isOK = resp->arg[0] & 0xff;
- uint8_t *data = resp->d.asBytes;
+ if (received) {
+ uint8_t isOK = resp.arg[0] & 0xff;
+ uint8_t *data = resp.d.asBytes;
if (j == 3) {
data[0] = (keyA[i][0]);
data[1] = (keyA[i][1]);
@@ -374,6 +613,8 @@ int CmdHF14AMfDump(const char *Cmd)
}
if (isOK) {
fwrite ( data, 1, 16, fout );
+ PrintAndLog("Dumped card data into 'dumpdata.bin'");
+
}
else {
PrintAndLog("Could not get access rights for block %d", i);
@@ -387,7 +628,6 @@ int CmdHF14AMfDump(const char *Cmd)
fclose(fin);
fclose(fout);
-
return 0;
}
@@ -414,10 +654,16 @@ int CmdHF14AMfRestore(const char *Cmd)
}
for (i=0 ; i<16 ; i++) {
- fread(keyA[i], 1, 6, fkeys);
+ if (fread(keyA[i], 1, 6, fkeys) == 0) {
+ PrintAndLog("File reading error.");
+ return 2;
+ }
}
for (i=0 ; i<16 ; i++) {
- fread(keyB[i], 1, 6, fkeys);
+ if (fread(keyB[i], 1, 6, fkeys) == 0) {
+ PrintAndLog("File reading error.");
+ return 2;
+ }
}
PrintAndLog("Restoring dumpdata.bin to card");
@@ -427,7 +673,10 @@ int CmdHF14AMfRestore(const char *Cmd)
UsbCommand c = {CMD_MIFARE_WRITEBL, {i*4 + j, keyType, 0}};
memcpy(c.d.asBytes, key, 6);
- fread(bldata, 1, 16, fdump);
+ if (fread(bldata, 1, 16, fdump) == 0) {
+ PrintAndLog("File reading error.");
+ return 2;
+ }
if (j == 3) {
bldata[0] = (keyA[i][0]);
@@ -458,10 +707,10 @@ int CmdHF14AMfRestore(const char *Cmd)
memcpy(c.d.asBytes + 10, bldata, 16);
SendCommand(&c);
- UsbCommand *resp = WaitForResponseTimeout(CMD_ACK, 1500);
- if (resp != NULL) {
- uint8_t isOK = resp->arg[0] & 0xff;
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ uint8_t isOK = resp.arg[0] & 0xff;
PrintAndLog("isOk:%02x", isOK);
} else {
PrintAndLog("Command execute timeout");
@@ -485,7 +734,7 @@ int CmdHF14AMfNested(const char *Cmd)
uint8_t blDiff = 0;
int SectorsCnt = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
- uint8_t keyBlock[16 * 6];
+ uint8_t keyBlock[6*6];
uint64_t key64 = 0;
int transferToEml = 0;
@@ -557,21 +806,13 @@ int CmdHF14AMfNested(const char *Cmd)
PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);
if (cmdp == 'o') {
- if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) {
+ if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {
PrintAndLog("Nested error.");
return 2;
}
-
- for (i = 0; i < 16; i++) {
- PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));
- }
-
- // test keys
- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);
- if (res)
- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);
- if (!res) {
- PrintAndLog("Found valid key:%012llx", key64);
+ key64 = bytes_to_num(keyBlock, 6);
+ if (key64) {
+ PrintAndLog("Found valid key:%012"llx, key64);
// transfer key to the emulator
if (transferToEml) {
@@ -588,6 +829,9 @@ int CmdHF14AMfNested(const char *Cmd)
}
}
else { // ------------------------------------ multiple sectors working
+ clock_t time1;
+ time1 = clock();
+
blDiff = blockNo % 4;
PrintAndLog("Block shift=%d", blDiff);
e_sector = calloc(SectorsCnt, sizeof(sector));
@@ -595,10 +839,10 @@ int CmdHF14AMfNested(const char *Cmd)
//test current key 4 sectors
memcpy(keyBlock, key, 6);
- num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 1 * 6));
- num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 2 * 6));
- num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 3 * 6));
- num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 4 * 6));
+ num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));
+ num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));
+ num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));
+ num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));
num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));
PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);
@@ -613,38 +857,47 @@ int CmdHF14AMfNested(const char *Cmd)
e_sector[i].foundKey[j] = 1;
}
}
- }
+ }
+
// nested sectors
iterations = 0;
PrintAndLog("nested...");
+ bool calibrate = true;
for (i = 0; i < NESTED_SECTOR_RETRY; i++) {
- for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4)
+ for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) {
for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) {
if (e_sector[trgBlockNo / 4].foundKey[trgKeyType]) continue;
- if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) continue;
+ PrintAndLog("-----------------------------------------------");
+ if(mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, calibrate)) {
+ PrintAndLog("Nested error.\n");
+ return 2;
+ }
+ else {
+ calibrate = false;
+ }
iterations++;
-
- //try keys from nested
- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);
- if (res)
- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);
- if (!res) {
- PrintAndLog("Found valid key:%012llx", key64);
+
+ key64 = bytes_to_num(keyBlock, 6);
+ if (key64) {
+ PrintAndLog("Found valid key:%012"llx, key64);
e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;
e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;
}
}
+ }
}
- PrintAndLog("Iterations count: %d", iterations);
+ printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);
+
+ PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);
//print them
PrintAndLog("|---|----------------|---|----------------|---|");
PrintAndLog("|sec|key A |res|key B |res|");
PrintAndLog("|---|----------------|---|----------------|---|");
for (i = 0; i < SectorsCnt; i++) {
- PrintAndLog("|%03d| %012llx | %d | %012llx | %d |", i,
+ PrintAndLog("|%03d| %012"llx" | %d | %012"llx" | %d |", i,
e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);
}
PrintAndLog("|---|----------------|---|----------------|---|");
@@ -730,19 +983,28 @@ int CmdHF14AMfChk(const char *Cmd)
keyBlock = calloc(stKeyBlock, 6);
if (keyBlock == NULL) return 1;
- num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 0 * 6)); // Default key (first key used by program if no user defined key)
- num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 1 * 6)); // Blank key
- num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 2 * 6)); // NFCForum MAD key
- num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 3 * 6));
- num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 4 * 6));
- num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 5 * 6));
- num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 6 * 6));
- num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 7 * 6));
- num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 8 * 6));
- num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 9 * 6));
- num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 10 * 6));
- num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 11 * 6));
- num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 12 * 6));
+ uint64_t defaultKeys[] =
+ {
+ 0xffffffffffff, // Default key (first key used by program if no user defined key)
+ 0x000000000000, // Blank key
+ 0xa0a1a2a3a4a5, // NFCForum MAD key
+ 0xb0b1b2b3b4b5,
+ 0xaabbccddeeff,
+ 0x4d3a99c351dd,
+ 0x1a982c7e459a,
+ 0xd3f7d3f7d3f7,
+ 0x714c5c886e97,
+ 0x587ee5f9350f,
+ 0xa0478cc39091,
+ 0x533cb6c723f6,
+ 0x8fd0a4f256e9
+ };
+ int defaultKeysSize = (sizeof(defaultKeys) / 7) - 1;
+
+ for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)
+ {
+ num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));
+ }
if (strlen(Cmd)<3) {
PrintAndLog("Usage: hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");
@@ -812,16 +1074,13 @@ int CmdHF14AMfChk(const char *Cmd)
}
if ( (f = fopen( filename , "r")) ) {
- while( !feof(f) ){
- memset(buf, 0, sizeof(buf));
- fgets(buf, sizeof(buf), f);
-
+ while( fgets(buf, sizeof(buf), f) ){
if (strlen(buf) < 12 || buf[11] == '\n')
continue;
while (fgetc(f) != '\n' && !feof(f)) ; //goto next line
- if( buf[0]=='#' ) continue; //The line start with # is remcommnet,skip
+ if( buf[0]=='#' ) continue; //The line start with # is comment, skip
if (!isxdigit(buf[0])){
PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);
@@ -841,8 +1100,9 @@ int CmdHF14AMfChk(const char *Cmd)
}
memset(keyBlock + 6 * keycnt, 0, 6);
num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
- PrintAndLog("chk custom key[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+ PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
keycnt++;
+ memset(buf, 0, sizeof(buf));
}
} else {
PrintAndLog("File: %s: not found or locked.", filename);
@@ -855,7 +1115,7 @@ int CmdHF14AMfChk(const char *Cmd)
if (keycnt == 0) {
PrintAndLog("No key specified,try default keys");
- for (;keycnt <=12; keycnt++)
+ for (;keycnt < defaultKeysSize; keycnt++)
PrintAndLog("chk default key[%d] %02x%02x%02x%02x%02x%02x", keycnt,
(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
@@ -865,24 +1125,19 @@ int CmdHF14AMfChk(const char *Cmd)
int b=blockNo;
for (int i=0; i<SectorsCnt; ++i) {
PrintAndLog("--SectorsCnt:%d block no:0x%02x key type:%C key count:%d ", i, b, t?'B':'A', keycnt);
- int size = keycnt>8?8:keycnt;
- for (int c = 0; c < keycnt; c+=size) {
- size=keycnt-c>8?8:keycnt-c;
- res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);
+ uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;
+ for (uint32_t c = 0; c < keycnt; c+=max_keys) {
+ uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;
+ res = mfCheckKeys(b, t, size, &keyBlock[6*c], &key64);
if (res !=1) {
if (!res) {
- PrintAndLog("Found valid key:[%012llx]",key64);
+ PrintAndLog("Found valid key:[%012"llx"]",key64);
if (transferToEml) {
uint8_t block[16];
mfEmlGetMem(block, get_trailer_block(b), 1);
num_to_bytes(key64, 6, block + t*10);
mfEmlSetMem(block, get_trailer_block(b), 1);
}
- break;
- }
- else {
- printf("Not found yet, keycnt:%d\r", c+size);
- fflush(stdout);
}
} else {
PrintAndLog("Command execute timeout");
@@ -929,24 +1184,68 @@ int CmdHF14AMfChk(const char *Cmd)
int CmdHF14AMf1kSim(const char *Cmd)
{
- uint8_t uid[4] = {0, 0, 0, 0};
-
+ uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};
+ uint8_t exitAfterNReads = 0;
+ uint8_t flags = 0;
+
if (param_getchar(Cmd, 0) == 'h') {
- PrintAndLog("Usage: hf mf sim <uid (8 hex symbols)>");
+ PrintAndLog("Usage: hf mf sim u <uid (8 hex symbols)> n <numreads> i x");
+ PrintAndLog(" u (Optional) UID. If not specified, the UID from emulator memory will be used");
+ PrintAndLog(" n (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");
+ PrintAndLog(" i (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");
+ PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");
PrintAndLog(" sample: hf mf sim 0a0a0a0a ");
return 0;
- }
-
- if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {
- PrintAndLog("UID must include 8 HEX symbols");
- return 1;
}
- PrintAndLog(" uid:%s ", sprint_hex(uid, 4));
-
- UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {0, 0, 0}};
- memcpy(c.d.asBytes, uid, 4);
+ uint8_t pnr = 0;
+ if (param_getchar(Cmd, pnr) == 'u') {
+ if(param_gethex(Cmd, pnr+1, uid, 8) == 0)
+ {
+ flags |=FLAG_4B_UID_IN_DATA; // UID from packet
+ }else if(param_gethex(Cmd,pnr+1,uid,14) == 0)
+ {
+ flags |= FLAG_7B_UID_IN_DATA;// UID from packet
+ }else
+ {
+ PrintAndLog("UID, if specified, must include 8 or 14 HEX symbols");
+ return 1;
+ }
+ pnr +=2;
+ }
+ if (param_getchar(Cmd, pnr) == 'n') {
+ exitAfterNReads = param_get8(Cmd,pnr+1);
+ pnr += 2;
+ }
+ if (param_getchar(Cmd, pnr) == 'i' ) {
+ //Using a flag to signal interactiveness, least significant bit
+ flags |= FLAG_INTERACTIVE;
+ pnr++;
+ }
+
+ if (param_getchar(Cmd, pnr) == 'x' ) {
+ //Using a flag to signal interactiveness, least significant bit
+ flags |= FLAG_NR_AR_ATTACK;
+ }
+ PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",
+ flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A"
+ , exitAfterNReads, flags,flags);
+
+
+ UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};
+ memcpy(c.d.asBytes, uid, sizeof(uid));
SendCommand(&c);
+ if(flags & FLAG_INTERACTIVE)
+ {
+ UsbCommand resp;
+ PrintAndLog("Press pm3-button 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... "
+ }
+ }
+
return 0;
}
@@ -985,10 +1284,6 @@ int CmdHF14AMfEGet(const char *Cmd)
}
blockNo = param_get8(Cmd, 0);
- if (blockNo >= 32 * 4 + 8 * 16) {
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
- return 1;
- }
PrintAndLog(" ");
if (!mfEmlGetMem(data, blockNo, 3)) {
@@ -1029,10 +1324,6 @@ int CmdHF14AMfESet(const char *Cmd)
}
blockNo = param_get8(Cmd, 0);
- if (blockNo >= 32 * 4 + 8 * 16) {
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
- return 1;
- }
if (param_gethex(Cmd, 1, memBlock, 32)) {
PrintAndLog("block data must include 32 HEX symbols");
@@ -1083,7 +1374,14 @@ int CmdHF14AMfELoad(const char *Cmd)
blockNum = 0;
while(!feof(f)){
memset(buf, 0, sizeof(buf));
- fgets(buf, sizeof(buf), f);
+ if (fgets(buf, sizeof(buf), f) == NULL) {
+ if(blockNum == 16 * 4)
+ {
+ break;
+ }
+ PrintAndLog("File reading error.");
+ return 2;
+ }
if (strlen(buf) < 32){
if(strlen(buf) && feof(f))
@@ -1109,7 +1407,7 @@ int CmdHF14AMfELoad(const char *Cmd)
PrintAndLog("File content error. There must be 64 blocks");
return 4;
}
- PrintAndLog("Loaded from file: %s", filename);
+ PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);
return 0;
}
@@ -1211,7 +1509,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
}
keyA = bytes_to_num(data, 6);
keyB = bytes_to_num(data + 10, 6);
- PrintAndLog("|%03d| %012llx | %012llx |", i, keyA, keyB);
+ PrintAndLog("|%03d| %012"llx" | %012"llx" |", i, keyA, keyB);
}
PrintAndLog("|---|----------------|----------------|");
@@ -1270,10 +1568,6 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
}
blockNo = param_get8(Cmd, 0);
- if (blockNo >= 32 * 4 + 8 * 16) {
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
- return 1;
- }
if (param_gethex(Cmd, 1, memBlock, 32)) {
PrintAndLog("block data must include 32 HEX symbols");
@@ -1354,7 +1648,10 @@ int CmdHF14AMfCLoad(const char *Cmd)
flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;
while(!feof(f)){
memset(buf, 0, sizeof(buf));
- fgets(buf, sizeof(buf), f);
+ if (fgets(buf, sizeof(buf), f) == NULL) {
+ PrintAndLog("File reading error.");
+ return 2;
+ }
if (strlen(buf) < 32){
if(strlen(buf) && feof(f))
@@ -1401,10 +1698,6 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
}
blockNo = param_get8(Cmd, 0);
- if (blockNo >= 32 * 4 + 8 * 16) {
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
- return 1;
- }
PrintAndLog("--block number:%02x ", blockNo);
@@ -1542,18 +1835,139 @@ int CmdHF14AMfCSave(const char *Cmd) {
}
}
+int CmdHF14AMfSniff(const char *Cmd){
+ // params
+ bool wantLogToFile = 0;
+ bool wantDecrypt = 0;
+ //bool wantSaveToEml = 0; TODO
+ bool wantSaveToEmlFile = 0;
+
+ //var
+ int res = 0;
+ int len = 0;
+ int blockLen = 0;
+ int num = 0;
+ int pckNum = 0;
+ uint8_t uid[8];
+ uint8_t atqa[2];
+ uint8_t sak;
+ bool isTag;
+ uint32_t parity;
+ uint8_t buf[3000];
+ uint8_t * bufPtr = buf;
+ memset(buf, 0x00, 3000);
+
+ if (param_getchar(Cmd, 0) == 'h') {
+ PrintAndLog("It continuously get data from the field and saves it to: log, emulator, emulator file.");
+ PrintAndLog("You can specify:");
+ PrintAndLog(" l - save encrypted sequence to logfile `uid.log`");
+ PrintAndLog(" d - decrypt sequence and put it to log file `uid.log`");
+ PrintAndLog(" n/a e - decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");
+ PrintAndLog(" r - decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");
+ PrintAndLog("Usage: hf mf sniff [l][d][e][r]");
+ PrintAndLog(" sample: hf mf sniff l d e");
+ return 0;
+ }
+
+ for (int i = 0; i < 4; i++) {
+ char ctmp = param_getchar(Cmd, i);
+ if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;
+ if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;
+ //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO
+ if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;
+ }
+
+ printf("-------------------------------------------------------------------------\n");
+ printf("Executing command. \n");
+ printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");
+ printf("Press the key on pc keyboard to abort the client.\n");
+ printf("-------------------------------------------------------------------------\n");
+
+ UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};
+ clearCommandBuffer();
+ SendCommand(&c);
+
+ // wait cycle
+ while (true) {
+ printf(".");
+ fflush(stdout);
+ if (ukbhit()) {
+ getchar();
+ printf("\naborted via keyboard!\n");
+ break;
+ }
+
+ UsbCommand resp;
+ if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {
+ res = resp.arg[0] & 0xff;
+ len = resp.arg[1];
+ num = resp.arg[2];
+
+ if (res == 0) return 0;
+ if (res == 1) {
+ if (num ==0) {
+ bufPtr = buf;
+ memset(buf, 0x00, 3000);
+ }
+ memcpy(bufPtr, resp.d.asBytes, len);
+ bufPtr += len;
+ pckNum++;
+ }
+ if (res == 2) {
+ blockLen = bufPtr - buf;
+ bufPtr = buf;
+ printf(">\n");
+ PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);
+ num = 0;
+ while (bufPtr - buf + 9 < blockLen) {
+ isTag = bufPtr[3] & 0x80 ? true:false;
+ bufPtr += 4;
+ parity = *((uint32_t *)(bufPtr));
+ bufPtr += 4;
+ len = bufPtr[0];
+ bufPtr++;
+ if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {
+ memcpy(uid, bufPtr + 2, 7);
+ memcpy(atqa, bufPtr + 2 + 7, 2);
+ sak = bufPtr[11];
+
+ PrintAndLog("tag select uid:%s atqa:%02x %02x sak:0x%02x", sprint_hex(uid, 7), atqa[0], atqa[1], sak);
+ if (wantLogToFile || wantDecrypt) {
+ FillFileNameByUID(logHexFileName, uid, ".log", 7);
+ AddLogCurrentDT(logHexFileName);
+ }
+ if (wantDecrypt) mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);
+ } else {
+ PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));
+ if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);
+ if (wantDecrypt) mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);
+ }
+ bufPtr += len;
+ num++;
+ }
+ }
+ } // resp not NILL
+ } // while (true)
+
+ return 0;
+}
+
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
{"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"},
{"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"},
+ {"urdbl", CmdHF14AMfURdBl, 0, "Read MIFARE Ultralight block"},
+ {"urdcard", CmdHF14AMfURdCard, 0,"Read MIFARE Ultralight Card"},
+ {"uwrbl", CmdHF14AMfUWrBl, 0,"Write MIFARE Ultralight 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. param - <used card nonce>"},
+ {"mifare", CmdHF14AMifare, 0, "Read parity error messages."},
{"nested", CmdHF14AMfNested, 0, "Test nested authentication"},
+ {"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"},
@@ -1574,7 +1988,7 @@ static command_t CommandTable[] =
int CmdHFMF(const char *Cmd)
{
// flush
- while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+ WaitForResponseTimeout(CMD_ACK,NULL,100);
CmdsParse(CommandTable, Cmd);
return 0;