X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/df3e429d71bb4efdbc256e65ca1b09f7716ffc48..0920f54c660303f39642fcd91080cf94567e9d52:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 147e790e..33a4234c 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -23,6 +23,9 @@
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
+#include "cmdhfmfu.h"
+#include "nonce2key/nonce2key.h"
+#include "cmdhf.h"
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
@@ -123,32 +126,81 @@ char* getTagInfo(uint8_t uid) {
 	return manufactureMapping[len-1].desc; 
 }
 
-int CmdHF14AList(const char *Cmd)
-{
-	PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+
+int usage_hf_14a_sim(void) {
+	PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
+	PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
+	PrintAndLog("  Options : ");
+	PrintAndLog("    h     : this help");
+	PrintAndLog("    t     : 1 = MIFARE Classic");
+	PrintAndLog("            2 = MIFARE Ultralight");
+	PrintAndLog("            3 = MIFARE Desfire");
+	PrintAndLog("            4 = ISO/IEC 14443-4");
+	PrintAndLog("            5 = MIFARE Tnp3xxx");
+	PrintAndLog("            6 = MIFARE Mini");
+	PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
+	PrintAndLog("    u     : 4 or 7 byte UID");
+	PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
+	PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
+	PrintAndLog("          : hf 14a sim t 1 u 1122344 x\n");
+	return 0;
+}
+int usage_hf_14a_sniff(void){
+	PrintAndLog("It get data from the field and saves it into command buffer.");
+	PrintAndLog("Buffer accessible from command 'hf list 14a'");
+	PrintAndLog("Usage:  hf 14a sniff [c][r]");
+	PrintAndLog("c - triggered by first data from card");
+	PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
+	PrintAndLog("sample: hf 14a sniff c r");
+	return 0;
+}
+int usage_hf_14a_raw(void){
+	PrintAndLog("Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
+	PrintAndLog("       -h    this help");
+	PrintAndLog("       -r    do not read response");
+	PrintAndLog("       -c    calculate and append CRC");
+	PrintAndLog("       -p    leave the signal field ON after receive");
+	PrintAndLog("       -a    active signal field ON without select");
+	PrintAndLog("       -s    active signal field ON with select");
+	PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
+	PrintAndLog("       -t    timeout in ms");
+	PrintAndLog("       -T    use Topaz protocol to send command");
 	return 0;
 }
 
-void iso14a_set_timeout(uint32_t timeout) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_SET_TIMEOUT, 0, timeout}};
-	SendCommand(&c);
+int CmdHF14AList(const char *Cmd)
+{
+	//PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+	CmdHFList("14a");
+	return 0;
 }
 
 int CmdHF14AReader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+	clearCommandBuffer();
 	SendCommand(&c);
-
 	UsbCommand resp;
 	WaitForResponse(CMD_ACK,&resp);
 	
 	iso14a_card_select_t card;
 	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+	uint64_t select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
 	
 	if(select_status == 0) {
-		PrintAndLog("iso14443a card select failed");
+		if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
+		// disconnect
+		c.arg[0] = 0;
+		c.arg[1] = 0;
+		c.arg[2] = 0;
+		SendCommand(&c);
+		return 0;
+	}
+
+	if(select_status == 3) {
+		PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
+		PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
 		// disconnect
 		c.arg[0] = 0;
 		c.arg[1] = 0;
@@ -157,18 +209,60 @@ int CmdHF14AReader(const char *Cmd)
 		return 0;
 	}
 
-	PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
 	PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+	PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
 	PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
 
-	// Double & triple sized UID, can be mapped to a manufacturer.
-	// HACK: does this apply for Ultralight cards?
-	if ( card.uidlen > 4 ) {
-		PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
-	}
-
 	switch (card.sak) {
-		case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
+		case 0x00: 
+
+			//***************************************test****************
+			ul_switch_off_field();
+			
+			uint32_t tagT = GetHF14AMfU_Type();
+			ul_print_type(tagT, 0);
+
+			//reconnect for further tests
+			c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
+			c.arg[1] = 0;
+			c.arg[2] = 0;
+
+			clearCommandBuffer();
+			SendCommand(&c);
+
+			UsbCommand resp;
+			WaitForResponse(CMD_ACK,&resp);
+			
+			memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+			select_status = resp.arg[0];		// 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+			
+			if(select_status == 0) {
+				ul_switch_off_field();
+				return 0;
+			}
+
+			/*  orig
+			// check if the tag answers to GETVERSION (0x60)
+			c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+			c.arg[1] = 1;
+			c.arg[2] = 0;
+			c.d.asBytes[0] = 0x60;
+			SendCommand(&c);
+			WaitForResponse(CMD_ACK,&resp);
+		
+			uint8_t version[10] = {0};
+			memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
+			uint8_t len  = resp.arg[0] & 0xff;
+			switch ( len){
+				// todo, identify "Magic UL-C tags".  // they usually have a static nonce response to 0x1A command.
+				// UL-EV1, size, check version[6] == 0x0b (smaller)  0x0b * 4 == 48
+				case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);	break;				
+				case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
+				case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;
+			}
+			*/
+			break;
 		case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
 		case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
 		case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
@@ -185,6 +279,11 @@ int CmdHF14AReader(const char *Cmd)
 		default: ;
 	}
 
+	// Double & triple sized UID, can be mapped to a manufacturer.
+	if ( card.uidlen > 4 ) {
+		PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+	}
+	
 	// try to request ATS even if tag claims not to support it
 	if (select_status == 2) {
 		uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
@@ -192,10 +291,11 @@ int CmdHF14AReader(const char *Cmd)
 		c.arg[1] = 2;
 		c.arg[2] = 0;
 		memcpy(c.d.asBytes, rats, 2);
+		clearCommandBuffer();
 		SendCommand(&c);
 		WaitForResponse(CMD_ACK,&resp);
 		
-	    memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+	    memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
 		card.ats_len = resp.arg[0];				// note: ats_len includes CRC Bytes
 	} 
 
@@ -289,16 +389,16 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     x0 -> <1 kByte");
 						break;
 					case 0x01:
-						PrintAndLog("                     x0 -> 1 kByte");
+						PrintAndLog("                     x1 -> 1 kByte");
 						break;
 					case 0x02:
-						PrintAndLog("                     x0 -> 2 kByte");
+						PrintAndLog("                     x2 -> 2 kByte");
 						break;
 					case 0x03:
-						PrintAndLog("                     x0 -> 4 kByte");
+						PrintAndLog("                     x3 -> 4 kByte");
 						break;
 					case 0x04:
-						PrintAndLog("                     x0 -> 8 kByte");
+						PrintAndLog("                     x4 -> 8 kByte");
 						break;
 				}
 				switch (card.ats[pos + 3] & 0xf0) {
@@ -339,14 +439,17 @@ int CmdHF14AReader(const char *Cmd)
 
 	
 	// try to see if card responses to "chinese magic backdoor" commands.
+	uint8_t isOK = 0;
+	clearCommandBuffer();
 	c.cmd = CMD_MIFARE_CIDENT;
 	c.arg[0] = 0;
 	c.arg[1] = 0;
 	c.arg[2] = 0;	
 	SendCommand(&c);
-	WaitForResponse(CMD_ACK,&resp);
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+		isOK  = resp.arg[0] & 0xff;
+
+	PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
 	
 	// disconnect
 	c.cmd = CMD_READER_ISO_14443a;
@@ -399,97 +502,92 @@ int CmdHF14ACUIDs(const char *Cmd)
 // ## greg - added ability to specify tag UID
 int CmdHF14ASim(const char *Cmd)
 {
-	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{0,0,0}};
-	
-	// Retrieve the tag type
-	uint8_t tagtype = param_get8ex(Cmd,0,0,10);
-	
-	// When no argument was given, just print help message
-	if (tagtype == 0) {
-		PrintAndLog("");
-		PrintAndLog(" Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID");
-		PrintAndLog("");
-		PrintAndLog("   syntax: hf 14a sim <type> <uid>");
-		PrintAndLog("    types: 1 = MIFARE Classic");
-		PrintAndLog("           2 = MIFARE Ultralight");
-		PrintAndLog("           3 = MIFARE Desfire");
-		PrintAndLog("           4 = ISO/IEC 14443-4");
-		PrintAndLog("           5 = MIFARE Tnp3xxx");		
-		PrintAndLog("");
-		return 1;
+	bool errors = FALSE;
+	uint8_t flags = 0;
+	uint8_t tagtype = 1;
+	uint64_t uid = 0;
+	uint8_t cmdp = 0;
+
+	while(param_getchar(Cmd, cmdp) != 0x00)
+	{
+		switch(param_getchar(Cmd, cmdp))
+		{
+			case 'h':
+			case 'H':
+				return usage_hf_14a_sim();
+			case 't':
+			case 'T':
+				// Retrieve the tag type
+				tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+				if (tagtype == 0)
+					errors = true; 
+				cmdp += 2;
+				break;
+			case 'u':
+			case 'U':
+				// Retrieve the full 4 or 7 byte long uid 
+				uid = param_get64ex(Cmd, cmdp+1, 0, 16);
+				if (uid == 0 )
+					errors = TRUE;
+				 
+				if (uid > 0xffffffff) {
+					PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",uid);
+					flags |= FLAG_7B_UID_IN_DATA;
+				} else {
+					PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",uid);
+					flags |= FLAG_4B_UID_IN_DATA;
+				}
+				cmdp += 2;
+				break;
+			case 'x':
+			case 'X':
+				flags |= FLAG_NR_AR_ATTACK;
+				cmdp++;
+				break;
+			default:
+				PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+				errors = true;
+				break;
+			}
+		if(errors) break;
 	}
+
+	//Validations
+	if (errors) return usage_hf_14a_sim();
+
+	PrintAndLog("Press pm3-button to abort simulation");
 	
-	// Store the tag type
-	c.arg[0] = tagtype;
+	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
 	
-	// Retrieve the full 4 or 7 byte long uid 
-	uint64_t long_uid = param_get64ex(Cmd,1,0,16);
-
-	// Are we handling the (optional) second part uid?
-	if (long_uid > 0xffffffff) {
-		PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",long_uid);
-		// Store the second part
-		c.arg[2] = (long_uid & 0xffffffff);
-		long_uid >>= 32;
-		// Store the first part, ignore the first byte, it is replaced by cascade byte (0x88)
-		c.arg[1] = (long_uid & 0xffffff);
-	} else {
-		PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",long_uid);
-		// Only store the first part
-		c.arg[1] = long_uid & 0xffffffff;
-	}
-/*
-		// At lease save the mandatory first part of the UID
-		c.arg[0] = long_uid & 0xffffffff;
+	num_to_bytes(uid, 7, c.d.asBytes);
+	clearCommandBuffer();
+	SendCommand(&c);	
 
-	if (c.arg[1] == 0) {
-		PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
+	uint8_t data[40];
+	uint8_t key[6];
+	UsbCommand resp;
+	while(!ukbhit()){
+		if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+			if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
+				memset(data, 0x00, sizeof(data));
+				memset(key, 0x00, sizeof(key));
+				int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
+				memcpy(data, resp.d.asBytes, len);
+				tryMfk32(uid, data, key);
+				//tryMfk32_moebius(uid, data, key);
+				//tryMfk64(uid, data, key);
+				PrintAndLog("--");
+			}
+		}
 	}
-	
-	switch (c.arg[0]) {
-		case 1: {
-			PrintAndLog("Emulating ISO/IEC 14443-3 type A tag with 4 byte UID");
-			UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16)};
-		} break;
-		case 2: {
-			PrintAndLog("Emulating ISO/IEC 14443-4 type A tag with 7 byte UID");
-		} break;
-		default: {
-			PrintAndLog("Error: unkown tag type (%d)",c.arg[0]);
-			PrintAndLog("syntax: hf 14a sim <uid>",c.arg[0]);
-			PrintAndLog(" type1: 4 ",c.arg[0]);
-
-			return 1;
-		} break;
-	}	
-*/
-/*
-  unsigned int hi = 0, lo = 0;
-  int n = 0, i = 0;
-  while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
-    hi= (hi << 4) | (lo >> 28);
-    lo= (lo << 4) | (n & 0xf);
-  }
-*/
-//	UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16)};
-//  PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
-  SendCommand(&c);
-  return 0;
+	return 0;
 }
 
-int CmdHF14ASnoop(const char *Cmd) {
+int CmdHF14ASniff(const char *Cmd) {
 	int param = 0;
 	
 	uint8_t ctmp = param_getchar(Cmd, 0) ;
-	if (ctmp == 'h' || ctmp == 'H') {
-		PrintAndLog("It get data from the field and saves it into command buffer.");
-		PrintAndLog("Buffer accessible from command hf list 14a.");
-		PrintAndLog("Usage:  hf 14a snoop [c][r]");
-		PrintAndLog("c - triggered by first data from card");
-		PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
-		PrintAndLog("sample: hf 14a snoop c r");
-		return 0;
-	}	
+	if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
 	
 	for (int i = 0; i < 2; i++) {
 		ctmp = param_getchar(Cmd, i);
@@ -498,36 +596,29 @@ int CmdHF14ASnoop(const char *Cmd) {
 	}
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+  clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
-    uint8_t reply=1;
-    uint8_t crc=0;
-    uint8_t power=0;
-    uint8_t active=0;
-    uint8_t active_select=0;
+    bool reply=1;
+    bool crc = FALSE;
+    bool power = FALSE;
+    bool active = FALSE;
+    bool active_select = FALSE;
     uint16_t numbits=0;
-	uint16_t timeout=0;
-	uint8_t bTimeout=0;
+	bool bTimeout = FALSE;
+	uint32_t timeout=0;
+	bool topazmode = FALSE;
     char buf[5]="";
     int i=0;
     uint8_t data[USB_CMD_DATA_SIZE];
-    unsigned int datalen=0, temp;
-
-    if (strlen(cmd)<2) {
-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
-        PrintAndLog("       -r    do not read response");
-        PrintAndLog("       -c    calculate and append CRC");
-        PrintAndLog("       -p    leave the signal field ON after receive");
-        PrintAndLog("       -a    active signal field ON without select");
-        PrintAndLog("       -s    active signal field ON with select");
-        PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
-		PrintAndLog("       -t    timeout");
-        return 0;
-    }
+	uint16_t datalen=0;
+	uint32_t temp;
+
+    if (strlen(cmd)<2) return usage_hf_14a_raw();
 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
@@ -536,20 +627,23 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
+				case 'H':
+				case 'h':
+					return usage_hf_14a_raw();
                 case 'r': 
-                    reply=0;
+                    reply = FALSE;
                     break;
                 case 'c':
-                    crc=1;
+                    crc = TRUE;
                     break;
                 case 'p':
-                    power=1;
+                    power = TRUE;
                     break;
                 case 'a':
-                    active=1;
+                    active = TRUE;
                     break;
                 case 's':
-                    active_select=1;
+                    active_select = TRUE;
                     break;
                 case 'b': 
                     sscanf(cmd+i+2,"%d",&temp);
@@ -559,16 +653,18 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     i-=2;
                     break;
 				case 't':
-					bTimeout=1;
+					bTimeout = TRUE;
 					sscanf(cmd+i+2,"%d",&temp);
-					timeout = temp & 0xFFFF;
+					timeout = temp;
 					i+=3;
 					while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-					i+=2;
+					i-=2;
+					break;
+                case 'T':
+					topazmode = TRUE;
 					break;
                 default:
-                    PrintAndLog("Invalid option");
-                    return 0;
+                    return usage_hf_14a_raw();
             }
             i+=2;
             continue;
@@ -584,7 +680,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);
                 *buf=0;
-				if (++datalen>sizeof(data)){
+				if (++datalen >= sizeof(data)){
 					if (crc)
 						PrintAndLog("Buffer is full, we can't add CRC to your data");
 					break;
@@ -595,10 +691,15 @@ int CmdHF14ACmdRaw(const char *cmd) {
         PrintAndLog("Invalid char on input");
         return 0;
     }
+
     if(crc && datalen>0 && datalen<sizeof(data)-2)
     {
         uint8_t first, second;
-        ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+		if (topazmode) {
+			ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
+		} else {
+			ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+		}
         data[datalen++] = first;
         data[datalen++] = second;
     }
@@ -609,24 +710,33 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if(active)
             c.arg[0] |= ISO14A_NO_SELECT;
     }
+
 	if(bTimeout){
-	    #define MAX_TIMEOUT 624*105 // max timeout is 624 ms
+	    #define MAX_TIMEOUT 40542464 	// = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
         c.arg[0] |= ISO14A_SET_TIMEOUT;
-        c.arg[2] = timeout * 105; // each bit is about 9.4 us
-        if(c.arg[2]>MAX_TIMEOUT) {
-            c.arg[2] = MAX_TIMEOUT;
-            PrintAndLog("Set timeout to 624 ms. The max we can wait for response");
+        if(timeout > MAX_TIMEOUT) {
+            timeout = MAX_TIMEOUT;
+            PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
         }
+		c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
 	}
+
     if(power)
         c.arg[0] |= ISO14A_NO_DISCONNECT;
+
     if(datalen>0)
         c.arg[0] |= ISO14A_RAW;
 
+	if(topazmode)
+		c.arg[0] |= ISO14A_TOPAZMODE;
+			
 	// Max buffer is USB_CMD_DATA_SIZE
-    c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
+	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+		
+    c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
     memcpy(c.d.asBytes,data,datalen);
 
+	clearCommandBuffer();
     SendCommand(&c);
 
     if (reply) {
@@ -638,8 +748,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
-static void waitCmd(uint8_t iSelect)
-{
+static void waitCmd(uint8_t iSelect) {
     uint8_t *recv;
     UsbCommand resp;
     char *hexout;
@@ -672,18 +781,19 @@ static command_t CommandTable[] =
   {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
   {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
   {"sim",    CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443a tag"},
-  {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
+  {"sniff",  CmdHF14ASniff,        0, "sniff ISO 14443 Type A traffic"},
   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
 };
 
 int CmdHF14A(const char *Cmd) {
 	// flush
-	WaitForResponseTimeout(CMD_ACK,NULL,100);
+	clearCommandBuffer();
+	//WaitForResponseTimeout(CMD_ACK,NULL,100);
 
 	// parse
-  CmdsParse(CommandTable, Cmd);
-  return 0;
+	CmdsParse(CommandTable, Cmd);
+	return 0;
 }
 
 int CmdHelp(const char *Cmd)