X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5acd09bdfb9b3777585f3875190e942e259a98f0..55eaed8f2ad26b9db249e2259c13444c38906795:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 4b405d2b..673737e2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -16,139 +16,20 @@
 #include "util.h"
 #include "iso14443crc.h"
 #include "data.h"
-#include "proxusb.h"
+#include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14a.h"
 #include "common.h"
 #include "cmdmain.h"
+#include "mifare.h"
 
 static int CmdHelp(const char *Cmd);
+static void waitCmd(uint8_t iLen);
 
 int CmdHF14AList(const char *Cmd)
 {
-  uint8_t got[1920];
-  GetFromBigBuf(got, sizeof(got));
-
-  PrintAndLog("recorded activity:");
-  PrintAndLog(" ETU     :rssi: who bytes");
-  PrintAndLog("---------+----+----+-----------");
-
-  int i = 0;
-  int prev = -1;
-
-  for (;;) {
-    if(i >= 1900) {
-      break;
-    }
-
-    bool isResponse;
-    int timestamp = *((uint32_t *)(got+i));
-    if (timestamp & 0x80000000) {
-      timestamp &= 0x7fffffff;
-      isResponse = 1;
-    } else {
-      isResponse = 0;
-    }
-
-    int metric = 0;
-    int parityBits = *((uint32_t *)(got+i+4));
-    // 4 bytes of additional information...
-    // maximum of 32 additional parity bit information
-    //
-    // TODO:
-    // at each quarter bit period we can send power level (16 levels)
-    // or each half bit period in 256 levels.
-
-
-    int len = got[i+8];
-
-    if (len > 100) {
-      break;
-    }
-    if (i + len >= 1900) {
-      break;
-    }
-
-    uint8_t *frame = (got+i+9);
-
-    // Break and stick with current result if buffer was not completely full
-    if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
-
-    char line[1000] = "";
-    int j;
-    for (j = 0; j < len; j++) {
-      int oddparity = 0x01;
-      int k;
-
-      for (k=0;k<8;k++) {
-        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-      }
-
-      //if((parityBits >> (len - j - 1)) & 0x01) {
-      if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
-        sprintf(line+(j*4), "%02x!  ", frame[j]);
-      }
-      else {
-        sprintf(line+(j*4), "%02x   ", frame[j]);
-      }
-    }
-
-    char *crc;
-    crc = "";
-    if (len > 2) {
-      uint8_t b1, b2;
-      for (j = 0; j < (len - 1); j++) {
-        // gives problems... search for the reason..
-        /*if(frame[j] == 0xAA) {
-          switch(frame[j+1]) {
-            case 0x01:
-              crc = "[1] Two drops close after each other";
-            break;
-            case 0x02:
-              crc = "[2] Potential SOC with a drop in second half of bitperiod";
-              break;
-            case 0x03:
-              crc = "[3] Segment Z after segment X is not possible";
-              break;
-            case 0x04:
-              crc = "[4] Parity bit of a fully received byte was wrong";
-              break;
-            default:
-              crc = "[?] Unknown error";
-              break;
-          }
-          break;
-        }*/
-      }
-
-      if (strlen(crc)==0) {
-        ComputeCrc14443(CRC_14443_A, frame, len-2, &b1, &b2);
-        if (b1 != frame[len-2] || b2 != frame[len-1]) {
-          crc = (isResponse & (len < 6)) ? "" : " !crc";
-        } else {
-          crc = "";
-        }
-      }
-    } else {
-      crc = ""; // SHORT
-    }
-
-    char metricString[100];
-    if (isResponse) {
-      sprintf(metricString, "%3d", metric);
-    } else {
-      strcpy(metricString, "   ");
-    }
-
-    PrintAndLog(" +%7d: %s: %s %s %s",
-      (prev < 0 ? 0 : (timestamp - prev)),
-      metricString,
-      (isResponse ? "TAG" : "   "), line, crc);
-
-    prev = timestamp;
-    i += (len + 9);
-  }
+	PrintAndLog("Deprecated command, use 'hf list 14a' instead");
 	return 0;
 }
 
@@ -159,99 +40,149 @@ void iso14a_set_timeout(uint32_t timeout) {
 
 int CmdHF14AReader(const char *Cmd)
 {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
 	SendCommand(&c);
-	UsbCommand * resp = WaitForResponse(CMD_ACK);
-	uint8_t              * uid  = resp->d.asBytes;
-	iso14a_card_select_t * card = (iso14a_card_select_t *)(uid + 12);
 
-	if(resp->arg[0] == 0) {
+	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
+	
+	if(select_status == 0) {
 		PrintAndLog("iso14443a card select failed");
+		// disconnect
+		c.arg[0] = 0;
+		c.arg[1] = 0;
+		c.arg[2] = 0;
+		SendCommand(&c);
 		return 0;
 	}
 
-	PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
-	PrintAndLog(" UID : %s", sprint_hex(uid, 12));
-	PrintAndLog(" SAK : %02x [%d]", card->sak, resp->arg[0]);
-
-	switch (card->sak) {
-		case 0x00: PrintAndLog(" SAK : NXP MIFARE Ultralight | Ultralight C"); break;
-		case 0x04: PrintAndLog(" SAK : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
-
-		case 0x08: PrintAndLog(" SAK : NXP MIFARE CLASSIC 1k | Plus 2k"); break;
-		case 0x09: PrintAndLog(" SAK : NXP MIFARE Mini 0.3k"); break;
-		case 0x10: PrintAndLog(" SAK : NXP MIFARE Plus 2k"); break;
-		case 0x11: PrintAndLog(" SAK : NXP MIFARE Plus 4k"); break;
-		case 0x18: PrintAndLog(" SAK : NXP MIFARE Classic 4k | Plus 4k"); break;
-		case 0x20: PrintAndLog(" SAK : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k | JCOP 31/41"); break;
-		case 0x24: PrintAndLog(" SAK : NXP MIFARE DESFire | DESFire EV1"); break;
-		case 0x28: PrintAndLog(" SAK : JCOP31 or JCOP41 v2.3.1"); break;
-		case 0x38: PrintAndLog(" SAK : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
-		case 0x88: PrintAndLog(" SAK : Infineon MIFARE CLASSIC 1K"); break;
-		case 0x98: PrintAndLog(" SAK : Gemplus MPCOS"); break;
+	PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+	PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+	PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
+
+	switch (card.sak) {
+		case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); 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;
+		case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
+		case 0x10: PrintAndLog("TYPE : NXP MIFARE Plus 2k SL2"); break;
+		case 0x11: PrintAndLog("TYPE : NXP MIFARE Plus 4k SL2"); break;
+		case 0x18: PrintAndLog("TYPE : NXP MIFARE Classic 4k | Plus 4k SL1"); break;
+		case 0x20: PrintAndLog("TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41"); break;
+		case 0x24: PrintAndLog("TYPE : NXP MIFARE DESFire | DESFire EV1"); break;
+		case 0x28: PrintAndLog("TYPE : JCOP31 or JCOP41 v2.3.1"); break;
+		case 0x38: PrintAndLog("TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
+		case 0x88: PrintAndLog("TYPE : Infineon MIFARE CLASSIC 1K"); break;
+		case 0x98: PrintAndLog("TYPE : Gemplus MPCOS"); break;
 		default: ;
 	}
-	if(resp->arg[0] == 1) {
+
+	
+	// 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
+		c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+		c.arg[1] = 2;
+		c.arg[2] = 0;
+		memcpy(c.d.asBytes, rats, 2);
+		SendCommand(&c);
+		WaitForResponse(CMD_ACK,&resp);
+		
+	    memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+		card.ats_len = resp.arg[0];				// note: ats_len includes CRC Bytes
+	} 
+
+	// disconnect
+	c.arg[0] = 0;
+	c.arg[1] = 0;
+	c.arg[2] = 0;
+	SendCommand(&c);
+
+	
+	if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
 		bool ta1 = 0, tb1 = 0, tc1 = 0;
 		int pos;
 
-		PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
-		if (card->ats_len > 0) {
-			PrintAndLog("       -  TL : length is %d bytes", card->ats[0]);
+		if (select_status == 2) {
+			PrintAndLog("SAK incorrectly claims that card doesn't support RATS");
 		}
-		if (card->ats_len > 1) {
-			ta1 = (card->ats[1] & 0x10) == 0x10;
-			tb1 = (card->ats[1] & 0x20) == 0x20;
-			tc1 = (card->ats[1] & 0x40) == 0x40;
+		PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
+		PrintAndLog("       -  TL : length is %d bytes", card.ats[0]);
+		if (card.ats[0] != card.ats_len - 2) {
+			PrintAndLog("ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
+		}
+		
+		if (card.ats[0] > 1) {		// there is a format byte (T0)
+			ta1 = (card.ats[1] & 0x10) == 0x10;
+			tb1 = (card.ats[1] & 0x20) == 0x20;
+			tc1 = (card.ats[1] & 0x40) == 0x40;
+			int16_t fsci = card.ats[1] & 0x0f;
 			PrintAndLog("       -  T0 : TA1 is%s present, TB1 is%s present, "
-					"TC1 is%s present, FSCI is %d",
+					"TC1 is%s present, FSCI is %d (FSC = %ld)",
 				(ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),
-				(card->ats[1] & 0x0f));
+				fsci,
+				fsci < 5 ? (fsci - 2) * 8 : 
+					fsci < 8 ? (fsci - 3) * 32 :
+					fsci == 8 ? 256 :
+					-1
+				);
 		}
 		pos = 2;
-		if (ta1 && card->ats_len > pos) {
+		if (ta1) {
 			char dr[16], ds[16];
 			dr[0] = ds[0] = '\0';
-			if (card->ats[pos] & 0x10) strcat(ds, "2, ");
-			if (card->ats[pos] & 0x20) strcat(ds, "4, ");
-			if (card->ats[pos] & 0x40) strcat(ds, "8, ");
-			if (card->ats[pos] & 0x01) strcat(dr, "2, ");
-			if (card->ats[pos] & 0x02) strcat(dr, "4, ");
-			if (card->ats[pos] & 0x04) strcat(dr, "8, ");
+			if (card.ats[pos] & 0x10) strcat(ds, "2, ");
+			if (card.ats[pos] & 0x20) strcat(ds, "4, ");
+			if (card.ats[pos] & 0x40) strcat(ds, "8, ");
+			if (card.ats[pos] & 0x01) strcat(dr, "2, ");
+			if (card.ats[pos] & 0x02) strcat(dr, "4, ");
+			if (card.ats[pos] & 0x04) strcat(dr, "8, ");
 			if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
 			if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
 			PrintAndLog("       - TA1 : different divisors are%s supported, "
 					"DR: [%s], DS: [%s]",
-					(card->ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
+					(card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
 			pos++;
 		}
-		if (tb1 && card->ats_len > pos) {
-			PrintAndLog("       - TB1 : SFGI = %d, FWI = %d",
-					(card->ats[pos] & 0x08),
-					(card->ats[pos] & 0x80) >> 4);
+		if (tb1) {
+			uint32_t sfgi = card.ats[pos] & 0x0F;
+			uint32_t fwi = card.ats[pos] >> 4;
+			PrintAndLog("       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
+					(sfgi),
+					sfgi ? "" : "(not needed) ",
+					sfgi ? (1 << 12) << sfgi : 0,
+					fwi,
+					(1 << 12) << fwi
+					);
 			pos++;
 		}
-		if (tc1 && card->ats_len > pos) {
+		if (tc1) {
 			PrintAndLog("       - TC1 : NAD is%s supported, CID is%s supported",
-					(card->ats[pos] & 0x01) ? "" : " NOT",
-					(card->ats[pos] & 0x02) ? "" : " NOT");
+					(card.ats[pos] & 0x01) ? "" : " NOT",
+					(card.ats[pos] & 0x02) ? "" : " NOT");
 			pos++;
 		}
-		if (card->ats_len > pos) {
+		if (card.ats[0] > pos) {
 			char *tip = "";
-			if (card->ats_len - pos > 7) {
-				if (memcmp(card->ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
+			if (card.ats[0] - pos >= 7) {
+				if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
 					tip = "-> MIFARE Plus X 2K or 4K";
-				} else if (memcmp(card->ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
+				} else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
 					tip = "-> MIFARE Plus S 2K or 4K";
 				}
 			} 
-			PrintAndLog("       -  HB : %s%s", sprint_hex(card->ats + pos, card->ats_len - pos - 2), tip);
-			if (card->ats[pos] == 0xC1) {
+			PrintAndLog("       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
+			if (card.ats[pos] == 0xC1) {
 				PrintAndLog("               c1 -> Mifare or (multiple) virtual cards of various type");
 				PrintAndLog("                  %02x -> Length is %d bytes",
-						card->ats[pos + 1], card->ats[pos + 1]);
-				switch (card->ats[pos + 2] & 0xf0) {
+						card.ats[pos + 1], card.ats[pos + 1]);
+				switch (card.ats[pos + 2] & 0xf0) {
 					case 0x10:
 						PrintAndLog("                     1x -> MIFARE DESFire");
 						break;
@@ -259,7 +190,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     2x -> MIFARE Plus");
 						break;
 				}
-				switch (card->ats[pos + 2] & 0x0f) {
+				switch (card.ats[pos + 2] & 0x0f) {
 					case 0x00:
 						PrintAndLog("                     x0 -> <1 kByte");
 						break;
@@ -276,7 +207,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     x0 -> 8 kByte");
 						break;
 				}
-				switch (card->ats[pos + 3] & 0xf0) {
+				switch (card.ats[pos + 3] & 0xf0) {
 					case 0x00:
 						PrintAndLog("                        0x -> Engineering sample");
 						break;
@@ -284,7 +215,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                        2x -> Released");
 						break;
 				}
-				switch (card->ats[pos + 3] & 0x0f) {
+				switch (card.ats[pos + 3] & 0x0f) {
 					case 0x00:
 						PrintAndLog("                        x0 -> Generation 1");
 						break;
@@ -295,7 +226,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                        x2 -> Generation 3");
 						break;
 				}
-				switch (card->ats[pos + 4] & 0x0f) {
+				switch (card.ats[pos + 4] & 0x0f) {
 					case 0x00:
 						PrintAndLog("                           x0 -> Only VCSL supported");
 						break;
@@ -308,11 +239,11 @@ int CmdHF14AReader(const char *Cmd)
 				}
 			}
 		}
+	} else {
+		PrintAndLog("proprietary non iso14443-4 card found, RATS not supported");
 	}
-	else
-		PrintAndLog("proprietary non-iso14443a card found, RATS not supported");
 
-	return resp->arg[0];
+	return select_status;
 }
 
 // Collect ISO14443 Type A UIDs
@@ -330,21 +261,21 @@ int CmdHF14ACUIDs(const char *Cmd)
 		// execute anticollision procedure
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
 		SendCommand(&c);
-		UsbCommand *resp = WaitForResponse(CMD_ACK);
-		uint8_t *uid  = resp->d.asBytes;
-		iso14a_card_select_t *card = (iso14a_card_select_t *)(uid + 12);
+    
+		UsbCommand resp;
+		WaitForResponse(CMD_ACK,&resp);
+
+		iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
 
 		// check if command failed
-		if (resp->arg[0] == 0) {
+		if (resp.arg[0] == 0) {
 			PrintAndLog("Card select failed.");
 		} else {
-			// check if UID is 4 bytes
-			if ((card->atqa[1] & 0xC0) == 0) {
-				PrintAndLog("%02X%02X%02X%02X",
-				            *uid, *(uid + 1), *(uid + 2), *(uid + 3));
-			} else {
-				PrintAndLog("UID longer than 4 bytes");
+			char uid_string[20];
+			for (uint16_t i = 0; i < card->uidlen; i++) {
+				sprintf(&uid_string[2*i], "%02X", card->uid[i]);
 			}
+			PrintAndLog("%s", uid_string);
 		}
 	}
 	PrintAndLog("End: %u", time(NULL));
@@ -371,6 +302,7 @@ int CmdHF14ASim(const char *Cmd)
 		PrintAndLog("           2 = MIFARE Ultralight");
 		PrintAndLog("           3 = MIFARE DESFIRE");
 		PrintAndLog("           4 = ISO/IEC 14443-4");
+		PrintAndLog("           5 = MIFARE TNP3XXX");		
 		PrintAndLog("");
 		return 1;
 	}
@@ -383,7 +315,7 @@ int CmdHF14ASim(const char *Cmd)
 
 	// Are we handling the (optional) second part uid?
 	if (long_uid > 0xffffffff) {
-		PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014llx)",long_uid);
+		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;
@@ -398,10 +330,6 @@ int CmdHF14ASim(const char *Cmd)
 		// At lease save the mandatory first part of the UID
 		c.arg[0] = long_uid & 0xffffffff;
 
-	
-	// At lease save the mandatory first part of the UID
-	c.arg[0] = long_uid & 0xffffffff;
-	
 	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]);
 	}
@@ -442,7 +370,7 @@ int CmdHF14ASnoop(const char *Cmd) {
 	
 	if (param_getchar(Cmd, 0) == 'h') {
 		PrintAndLog("It get data from the field and saves it into command buffer.");
-		PrintAndLog("Buffer accessible from command hf 14a list.");
+		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,...)");
@@ -461,21 +389,160 @@ int CmdHF14ASnoop(const char *Cmd) {
   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;
+    uint16_t numbits=0;
+    char buf[5]="";
+    int i=0;
+    uint8_t data[100];
+    unsigned int datalen=0, temp;
+
+    if (strlen(cmd)<2) {
+        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] <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");
+        return 0;
+    }
+
+    // strip
+    while (*cmd==' ' || *cmd=='\t') cmd++;
+
+    while (cmd[i]!='\0') {
+        if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
+        if (cmd[i]=='-') {
+            switch (cmd[i+1]) {
+                case 'r': 
+                    reply=0;
+                    break;
+                case 'c':
+                    crc=1;
+                    break;
+                case 'p':
+                    power=1;
+                    break;
+                case 'a':
+                    active=1;
+                    break;
+                case 's':
+                    active_select=1;
+                    break;
+                case 'b': 
+                    sscanf(cmd+i+2,"%d",&temp);
+                    numbits = temp & 0xFFFF;
+                    i+=3;
+                    while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
+                    i-=2;
+                    break;
+                default:
+                    PrintAndLog("Invalid option");
+                    return 0;
+            }
+            i+=2;
+            continue;
+        }
+        if ((cmd[i]>='0' && cmd[i]<='9') ||
+            (cmd[i]>='a' && cmd[i]<='f') ||
+            (cmd[i]>='A' && cmd[i]<='F') ) {
+            buf[strlen(buf)+1]=0;
+            buf[strlen(buf)]=cmd[i];
+            i++;
+
+            if (strlen(buf)>=2) {
+                sscanf(buf,"%x",&temp);
+                data[datalen]=(uint8_t)(temp & 0xff);
+                datalen++;
+                *buf=0;
+            }
+            continue;
+        }
+        PrintAndLog("Invalid char on input");
+        return 0;
+    }
+    if(crc && datalen>0)
+    {
+        uint8_t first, second;
+        ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+        data[datalen++] = first;
+        data[datalen++] = second;
+    }
+
+    if(active || active_select)
+    {
+        c.arg[0] |= ISO14A_CONNECT;
+        if(active)
+            c.arg[0] |= ISO14A_NO_SELECT;
+    }
+    if(power)
+        c.arg[0] |= ISO14A_NO_DISCONNECT;
+    if(datalen>0)
+        c.arg[0] |= ISO14A_RAW;
+
+    c.arg[1] = datalen;
+    c.arg[2] = numbits;
+    memcpy(c.d.asBytes,data,datalen);
+
+    SendCommand(&c);
+
+    if (reply) {
+        if(active_select)
+            waitCmd(1);
+        if(datalen>0)
+            waitCmd(0);
+    } // if reply
+    return 0;
+}
+
+static void waitCmd(uint8_t iSelect)
+{
+    uint8_t *recv;
+    UsbCommand resp;
+    char *hexout;
+
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+        recv = resp.d.asBytes;
+        uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
+        PrintAndLog("received %i octets",iLen);
+        if(!iLen)
+            return;
+        hexout = (char *)malloc(iLen * 3 + 1);
+        if (hexout != NULL) {
+            for (int i = 0; i < iLen; i++) { // data in hex
+                sprintf(&hexout[i * 3], "%02X ", recv[i]);
+            }
+            PrintAndLog("%s", hexout);
+            free(hexout);
+        } else {
+            PrintAndLog("malloc failed your client has low memory?");
+        }
+    } else {
+        PrintAndLog("timeout while waiting for reply.");
+    }
+}
+
 static command_t CommandTable[] = 
 {
   {"help",   CmdHelp,              1, "This help"},
-  {"list",   CmdHF14AList,         0, "List ISO 14443a history"},
+  {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
   {"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> -- Fake ISO 14443a tag"},
   {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
+  {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
 };
 
-int CmdHF14A(const char *Cmd)
-{
+int CmdHF14A(const char *Cmd) {
 	// flush
-	while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+	WaitForResponseTimeout(CMD_ACK,NULL,100);
 
 	// parse
   CmdsParse(CommandTable, Cmd);