Applied Holiman's fixes for iclass.c and CSNs

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index f2774a16a8ffcad5357d5e614c51f36c40611dca..d1d440eeb7bafa26188d9708fbbd0b8f6fcd1808 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -13,146 +13,142 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-#include <ctype.h>

 #include "util.h"
 #include "util.h"

-#include "iso14443crc.h"
+#include "../common/iso14443crc.h"

 #include "data.h"
 #include "data.h"

-#include "proxusb.h"
+#include "proxmark3.h"

 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14a.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14a.h"

-#include "common.h"
+#include "../include/common.h"

 #include "cmdmain.h"
 #include "cmdmain.h"

-#include "nonce2key/nonce2key.h"
-#include "nonce2key/crapto1.h"
-#include "mifarehost.h"
+#include "../include/mifare.h"

 
 static int CmdHelp(const char *Cmd);
 
 static int CmdHelp(const char *Cmd);

+static void waitCmd(uint8_t iLen);

 
 int CmdHF14AList(const char *Cmd)
 {
 
 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;
-    }
+       bool ShowWaitCycles = false;
+       char param = param_getchar(Cmd, 0);
+       
+       if (param == 'h' || (param != 0 && param != 'f')) {
+               PrintAndLog("List data in trace buffer.");
+               PrintAndLog("Usage:  hf 14a list [f]");
+               PrintAndLog("f - show frame delay times as well");
+               PrintAndLog("sample: hf 14a list f");
+               return 0;
+       }       

 
 

-    uint8_t *frame = (got+i+9);
+       if (param == 'f') {
+               ShowWaitCycles = true;
+       }
+               
+       uint8_t trace[TRACE_BUFFER_SIZE];
+       GetFromBigBuf(trace,TRACE_BUFFER_SIZE,0);
+       WaitForResponse(CMD_ACK,NULL);
+
+       PrintAndLog("Recorded Activity");
+       PrintAndLog("");
+       PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
+       PrintAndLog("All times are in carrier periods (1/13.56Mhz)");
+       PrintAndLog("");
+       PrintAndLog("     Start |       End | Src | Data");
+       PrintAndLog("-----------|-----------|-----|--------");
+
+       uint16_t tracepos = 0;
+       uint16_t duration;
+       uint16_t data_len;
+       uint16_t parity_len;
+       bool isResponse;
+       uint32_t timestamp;
+       uint32_t first_timestamp;
+       uint32_t EndOfTransmissionTimestamp;
+       
+       for (;;) {
+       
+               if( tracepos >= TRACE_BUFFER_SIZE) break;
+       
+               timestamp = *((uint32_t *)(trace + tracepos));
+               if(tracepos == 0) {
+                       first_timestamp = timestamp;
+               }
+               tracepos += 4;
+               duration = *((uint16_t *)(trace + tracepos));
+               tracepos += 2;
+               data_len = *((uint16_t *)(trace + tracepos));
+               tracepos += 2;
+
+               if (data_len & 0x8000) {
+                       data_len &= 0x7fff;
+                       isResponse = true;
+               } else {
+                       isResponse = false;
+               }

 
 

-    // Break and stick with current result if buffer was not completely full
-    if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
+               parity_len = (data_len-1)/8 + 1;

 
 

-    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 (tracepos + data_len + parity_len >= TRACE_BUFFER_SIZE) { break; }

 
 

-      //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]);
-      }
-    }
+               uint8_t *frame = trace + tracepos;
+               tracepos += data_len;
+               uint8_t *parityBytes = trace + tracepos;
+               tracepos += parity_len;

 
 

-    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
-    }
+               // Break and stick with current result if buffer was not completely full
+               if (timestamp == 0x44444444) break; 

 
 

-    char metricString[100];
-    if (isResponse) {
-      sprintf(metricString, "%3d", metric);
-    } else {
-      strcpy(metricString, "   ");
-    }
+               char line[1000] = "";
+               int j;
+               for (j = 0; j < data_len; j++) {
+                       int oddparity = 0x01;
+                       int k;

 
 

-    PrintAndLog(" +%7d: %s: %s %s %s",
-      (prev < 0 ? 0 : (timestamp - prev)),
-      metricString,
-      (isResponse ? "TAG" : "   "), line, crc);
+                       for (k=0;k<8;k++) {
+                               oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
+                       }

 
 

-    prev = timestamp;
-    i += (len + 9);
-  }
+                       uint8_t parityBits = parityBytes[j>>3];
+                       if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+                               sprintf(line+(j*4), "%02x! ", frame[j]);
+                       } else {
+                               sprintf(line+(j*4), "%02x ", frame[j]);
+                       }
+               }
+                       
+               char crc[6] = ""; 
+               if (data_len > 2) {
+                       uint8_t b1, b2;
+                       ComputeCrc14443(CRC_14443_A, frame, data_len-2, &b1, &b2);
+                       if (b1 != frame[data_len-2] || b2 != frame[data_len-1]) {
+                               sprintf(crc, (isResponse & (data_len < 6)) ? "" : " !crc");
+                       } else {
+                               sprintf(crc, "");
+                       }
+               
+               EndOfTransmissionTimestamp = timestamp + duration;
+               
+               PrintAndLog(" %9d | %9d | %s | %s %s",
+                       (timestamp - first_timestamp),
+                       (EndOfTransmissionTimestamp - first_timestamp),
+                       (isResponse ? "Tag" : "Rdr"),
+                       line,
+                       crc);
+       
+               bool next_isResponse = *((uint16_t *)(trace + tracepos + 6)) & 0x8000;
+               if (ShowWaitCycles && !isResponse && next_isResponse) {
+                       uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
+                       if (next_timestamp != 0x44444444) {
+                       PrintAndLog(" %9d | %9d | %s | fdt (Frame Delay Time): %d",
+                               (EndOfTransmissionTimestamp - first_timestamp),
+                               (next_timestamp - first_timestamp),
+                               " ",
+                               (next_timestamp - EndOfTransmissionTimestamp));
+                               }
+                       }
+               }
+       }

        return 0;
 }
 
        return 0;
 }
 


@@ -161,564 +157,490 @@ void iso14a_set_timeout(uint32_t timeout) {
        SendCommand(&c);
 }
 
        SendCommand(&c);
 }
 

-int CmdHF14AMifare(const char *Cmd)
+int CmdHF14AReader(const char *Cmd)

 {
 {

-       uint32_t uid = 0;
-       uint32_t nt = 0;
-       uint64_t par_list = 0, ks_list = 0, r_key = 0;
-       uint8_t isOK = 0;
-       uint8_t keyBlock[6] = {0,0,0,0,0,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, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};

        SendCommand(&c);
        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(".");
-               if (ukbhit()) {
-                       getchar();
-                       printf("\naborted via keyboard!\n");
-                       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);
-       
-                       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);
-
-       num_to_bytes(r_key, 6, keyBlock);
-       isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
-       if (!isOK) 
-               PrintAndLog("Found valid key:%012llx", r_key);
-       else
-               PrintAndLog("Found invalid key. (");    
-       
-       
-       return 0;
-}

 
 

-int CmdHF14AMfWrBl(const char *Cmd)
-{
-       uint8_t blockNo = 0;
-       uint8_t keyType = 0;
-       uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-       uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+       UsbCommand resp;
+       WaitForResponse(CMD_ACK,&resp);

        
        

-       char cmdp       = 0x00;
+       iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;

 
 

-       if (strlen(Cmd)<3) {
-               PrintAndLog("Usage:  hf 14 mfwrbl    <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
-               PrintAndLog("        sample: hf 14a mfwrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
-               return 0;
-       }       
-
-       blockNo = param_get8(Cmd, 0);
-       cmdp = param_getchar(Cmd, 1);
-       if (cmdp == 0x00) {
-               PrintAndLog("Key type must be A or B");
-               return 1;
-       }
-       if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-       if (param_gethex(Cmd, 2, key, 12)) {
-               PrintAndLog("Key must include 12 HEX symbols");
-               return 1;
-       }
-       if (param_gethex(Cmd, 3, bldata, 32)) {
-               PrintAndLog("Block data must include 32 HEX symbols");
-               return 1;
-       }
-       PrintAndLog("--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
-       PrintAndLog("--data: %s", sprint_hex(bldata, 16));
-       
-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
-       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;
-
-               PrintAndLog("isOk:%02x", isOK);
-       } else {
-               PrintAndLog("Command execute timeout");
-       }
-
-       return 0;
-}
-
-int CmdHF14AMfRdBl(const char *Cmd)
-{
-       uint8_t blockNo = 0;
-       uint8_t keyType = 0;
-       uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-       
-       char cmdp       = 0x00;
-
-
-       if (strlen(Cmd)<3) {
-               PrintAndLog("Usage:  hf 14 mfrdbl    <block number> <key A/B> <key (12 hex symbols)>");
-               PrintAndLog("        sample: hf 14a mfrdbl 0 A FFFFFFFFFFFF ");
-               return 0;
-       }       
-       
-       blockNo = param_get8(Cmd, 0);
-       cmdp = param_getchar(Cmd, 1);
-       if (cmdp == 0x00) {
-               PrintAndLog("Key type must be A or B");
-               return 1;
-       }
-       if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-       if (param_gethex(Cmd, 2, key, 12)) {
-               PrintAndLog("Key must include 12 HEX symbols");
-               return 1;
-       }
-       PrintAndLog("--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
-       
-  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;
-
-               if (isOK)
-                       PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-               else
-                       PrintAndLog("isOk:%02x", isOK);
-       } else {
-               PrintAndLog("Command execute timeout");
-       }
-
-  return 0;
-}
-
-int CmdHF14AMfRdSc(const char *Cmd)
-{
-       int i;
-       uint8_t sectorNo = 0;
-       uint8_t keyType = 0;
-       uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-       
-       uint8_t isOK  = 0;
-       uint8_t * data  = NULL;
-
-       char cmdp       = 0x00;
-
-       if (strlen(Cmd)<3) {
-               PrintAndLog("Usage:  hf 14 mfrdsc    <sector number> <key A/B> <key (12 hex symbols)>");
-               PrintAndLog("        sample: hf 14a mfrdsc 0 A FFFFFFFFFFFF ");
+       if(resp.arg[0] == 0) {
+               PrintAndLog("iso14443a card select failed");

                return 0;
                return 0;

-       }       
-       
-       sectorNo = param_get8(Cmd, 0);
-       if (sectorNo > 63) {
-               PrintAndLog("Sector number must be less than 64");
-               return 1;
-       }
-       cmdp = param_getchar(Cmd, 1);
-       if (cmdp == 0x00) {
-               PrintAndLog("Key type must be A or B");
-               return 1;
-       }
-       if (cmdp != 'A' && cmdp != 'a') keyType = 1;
-       if (param_gethex(Cmd, 2, key, 12)) {
-               PrintAndLog("Key must include 12 HEX symbols");
-               return 1;

        }
        }

-       PrintAndLog("--sector no:%02x key type:%02x key:%s ", sectorNo, keyType, sprint_hex(key, 6));
-       
-  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;
-
-               PrintAndLog("isOk:%02x", isOK);
-               if (isOK) 
-                       for (i = 0; i < 2; i++) {
-                               PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
-                       }
-       } else {
-               PrintAndLog("Command1 execute timeout");
+       PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
+       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) {
+               bool ta1 = 0, tb1 = 0, tc1 = 0;
+               int pos;

 
 

-               // response2
-       resp = WaitForResponseTimeout(CMD_ACK, 500);
-       PrintAndLog(" ");
-
-       if (resp != NULL) {
-               isOK  = resp->arg[0] & 0xff;
-               data  = resp->d.asBytes;
-
-               if (isOK) 
-                       for (i = 0; i < 2; i++) {
-                               PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
+               PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
+               if (card->ats_len > 0) {
+                       PrintAndLog("       -  TL : length is %d bytes", card->ats[0]);

                }
                }

-       } else {
-               PrintAndLog("Command2 execute timeout");
-       }
-       
-  return 0;
-}
-
-int CmdHF14AMfNested(const char *Cmd)
-{
-       int i, j, res, iterations;
-       sector  *       e_sector = NULL;
-       uint8_t blockNo = 0;
-       uint8_t keyType = 0;
-       uint8_t trgBlockNo = 0;
-       uint8_t trgKeyType = 0;
-       uint8_t blDiff = 0;
-       int  SectorsCnt = 0;
-       uint8_t key[6] = {0, 0, 0, 0, 0, 0};
-       uint8_t keyBlock[16 * 6];
-       uint64_t key64 = 0;
-       
-       char cmdp, ctmp;
-
-       if (strlen(Cmd)<3) {
-               PrintAndLog("Usage:");
-               PrintAndLog(" all sectors:  hf 14a nested  <card memory> <block number> <key A/B> <key (12 hex symbols)>");
-               PrintAndLog(" one sector:   hf 14a nested  o <block number> <key A/B> <key (12 hex symbols)>");
-               PrintAndLog("               <target block number> <target key A/B>");
-               PrintAndLog("card memory - 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");
-               PrintAndLog(" ");
-               PrintAndLog("      sample1: hf 14a nested 1 0 A FFFFFFFFFFFF ");
-               PrintAndLog("      sample2: hf 14a nested o 0 A FFFFFFFFFFFF 4 A");
-               return 0;
-       }       
-       
-       cmdp = param_getchar(Cmd, 0);
-       blockNo = param_get8(Cmd, 1);
-       ctmp = param_getchar(Cmd, 2);
-       if (ctmp == 0x00) {
-               PrintAndLog("Key type must be A or B");
-               return 1;
-       }
-       if (ctmp != 'A' && ctmp != 'a') keyType = 1;
-       if (param_gethex(Cmd, 3, key, 12)) {
-               PrintAndLog("Key must include 12 HEX symbols");
-               return 1;
-       }
-       
-       if (cmdp =='o' || cmdp == 'O') {
-               cmdp = 'o';
-               trgBlockNo = param_get8(Cmd, 4);
-               ctmp = param_getchar(Cmd, 5);
-               if (ctmp == 0x00) {
-                       PrintAndLog("Target key type must be A or B");
-                       return 1;
+               if (card->ats_len > 1) {
+                       ta1 = (card->ats[1] & 0x10) == 0x10;
+                       tb1 = (card->ats[1] & 0x20) == 0x20;
+                       tc1 = (card->ats[1] & 0x40) == 0x40;
+                       PrintAndLog("       -  T0 : TA1 is%s present, TB1 is%s present, "
+                                       "TC1 is%s present, FSCI is %d",
+                               (ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),
+                               (card->ats[1] & 0x0f));

                }
                }

-               if (ctmp != 'A' && ctmp != 'a') trgKeyType = 1;
-       } else {
-               switch (cmdp) {
-                       case '1': SectorsCnt = 16; break;
-                       case '2': SectorsCnt = 32; break;
-                       case '4': SectorsCnt = 64; break;
-                       default:  SectorsCnt = 16;
+               pos = 2;
+               if (ta1 && card->ats_len > pos) {
+                       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 (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);
+                       pos++;

                }
                }

-       }
-       
-       PrintAndLog("--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
-       if (cmdp == 'o')
-               PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);
-
-       if (cmdp == 'o') {
-               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) {
-                       PrintAndLog("Nested error.");
-                       return 2;
+               if (tb1 && card->ats_len > pos) {
+                       PrintAndLog("       - TB1 : SFGI = %d, FWI = %d",
+                                       (card->ats[pos] & 0x08),
+                                       (card->ats[pos] & 0x80) >> 4);
+                       pos++;

                }
                }

-
-               for (i = 0; i < 16; i++) {
-                       PrintAndLog("cnt=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));
+               if (tc1 && card->ats_len > pos) {
+                       PrintAndLog("       - TC1 : NAD is%s supported, CID is%s supported",
+                                       (card->ats[pos] & 0x01) ? "" : " NOT",
+                                       (card->ats[pos] & 0x02) ? "" : " NOT");
+                       pos++;

                }
                }

-       
-               // 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);
-               else
-                       PrintAndLog("No valid key found");
-       } else  // ------------------------------------  multiple sectors working
-       {
-               blDiff = blockNo % 4;
-               PrintAndLog("Block shift=%d", blDiff);
-               e_sector = calloc(SectorsCnt, sizeof(sector));
-               if (e_sector == NULL) return 1;
-               
-               //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(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));
-
-               PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);
-               for (i = 0; i < SectorsCnt; i++) {
-                       for (j = 0; j < 2; j++) {
-                               if (e_sector[i].foundKey[j]) continue;
-                               
-                               res = mfCheckKeys(i * 4 + blDiff, j, 6, keyBlock, &key64);
-                               
-                               if (!res) {
-                                       e_sector[i].Key[j] = key64;
-                                       e_sector[i].foundKey[j] = 1;
+               if (card->ats_len > pos) {
+                       char *tip = "";
+                       if (card->ats_len - 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) {
+                                       tip = "-> MIFARE Plus S 2K or 4K";

                                }
                                }

-                       }
-               } 
-               
-               
-               // nested sectors
-               iterations = 0;
-               PrintAndLog("nested...");
-               for (i = 0; i < NESTED_SECTOR_RETRY; i++) {
-                       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;
-                                       
-                                       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);  
-                                               e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;
-                                               e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;
-                                       }
+                       } 
+                       PrintAndLog("       -  HB : %s%s", sprint_hex(card->ats + pos, card->ats_len - pos - 2), 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) {
+                                       case 0x10:
+                                               PrintAndLog("                     1x -> MIFARE DESFire");
+                                               break;
+                                       case 0x20:
+                                               PrintAndLog("                     2x -> MIFARE Plus");
+                                               break;
+                               }
+                               switch (card->ats[pos + 2] & 0x0f) {
+                                       case 0x00:
+                                               PrintAndLog("                     x0 -> <1 kByte");
+                                               break;
+                                       case 0x01:
+                                               PrintAndLog("                     x0 -> 1 kByte");
+                                               break;
+                                       case 0x02:
+                                               PrintAndLog("                     x0 -> 2 kByte");
+                                               break;
+                                       case 0x03:
+                                               PrintAndLog("                     x0 -> 4 kByte");
+                                               break;
+                                       case 0x04:
+                                               PrintAndLog("                     x0 -> 8 kByte");
+                                               break;

                                }
                                }

+                               switch (card->ats[pos + 3] & 0xf0) {
+                                       case 0x00:
+                                               PrintAndLog("                        0x -> Engineering sample");
+                                               break;
+                                       case 0x20:
+                                               PrintAndLog("                        2x -> Released");
+                                               break;
+                               }
+                               switch (card->ats[pos + 3] & 0x0f) {
+                                       case 0x00:
+                                               PrintAndLog("                        x0 -> Generation 1");
+                                               break;
+                                       case 0x01:
+                                               PrintAndLog("                        x1 -> Generation 2");
+                                               break;
+                                       case 0x02:
+                                               PrintAndLog("                        x2 -> Generation 3");
+                                               break;
+                               }
+                               switch (card->ats[pos + 4] & 0x0f) {
+                                       case 0x00:
+                                               PrintAndLog("                           x0 -> Only VCSL supported");
+                                               break;
+                                       case 0x01:
+                                               PrintAndLog("                           x1 -> VCS, VCSL, and SVC supported");
+                                               break;
+                                       case 0x0E:
+                                               PrintAndLog("                           xE -> no VCS command supported");
+                                               break;
+                               }
+                       }

                }
                }

+       } else {
+               PrintAndLog("proprietary non iso14443a-4 card found, RATS not supported");
+       }
+
+       return resp.arg[0];
+}

 
 

-               PrintAndLog("Iterations count: %d", iterations);
-               //print them
-               PrintAndLog("|---|----------------|---|----------------|---|");
-               PrintAndLog("|blk|key A           |res|key B           |res|");
-               PrintAndLog("|---|----------------|---|----------------|---|");
-               for (i = 0; i < SectorsCnt; i++) {
-                       PrintAndLog("|%03d|  %012llx  | %d |  %012llx  | %d |", i, 
-                               e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);
+// Collect ISO14443 Type A UIDs
+int CmdHF14ACUIDs(const char *Cmd)
+{
+       // requested number of UIDs
+       int n = atoi(Cmd);
+       // collect at least 1 (e.g. if no parameter was given)
+       n = n > 0 ? n : 1;
+
+       PrintAndLog("Collecting %d UIDs", n);
+       PrintAndLog("Start: %u", time(NULL));
+       // repeat n times
+       for (int i = 0; i < n; i++) {
+               // execute anticollision procedure
+               UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+               SendCommand(&c);
+    
+               UsbCommand resp;
+               WaitForResponse(CMD_ACK,&resp);
+
+               uint8_t *uid  = resp.d.asBytes;
+               iso14a_card_select_t *card = (iso14a_card_select_t *)(uid + 12);
+
+               // check if command failed
+               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");
+                       }

                }
                }

-               PrintAndLog("|---|----------------|---|----------------|---|");
-               
-               free(e_sector);

        }
        }

+       PrintAndLog("End: %u", time(NULL));

 
 

-       return 0;
+       return 1;

 }
 
 }
 

-int CmdHF14AMfChk(const char *Cmd)
+// ## simulate iso14443a tag
+// ## greg - added ability to specify tag UID
+int CmdHF14ASim(const char *Cmd)

 {
 {

-       int i, res;
-       int     keycnt = 0;
-       char ctmp       = 0x00;
-       uint8_t blockNo = 0;
-       uint8_t keyType = 0;
-       uint8_t keyBlock[8 * 6];
-       uint64_t key64 = 0;
-
-       memset(keyBlock, 0x00, sizeof(keyBlock));
-
-       if (strlen(Cmd)<3) {
-               PrintAndLog("Usage:  hf 14a chk <block number> <key A/B> [<key (12 hex symbols)>]");
-               PrintAndLog("      sample: hf 14a chk 0 A FFFFFFFFFFFF a0a1a2a3a4a5 b01b2b3b4b5 ");
-               return 0;
-       }       
-       
-       blockNo = param_get8(Cmd, 0);
-       ctmp = param_getchar(Cmd, 1);
-       if (ctmp == 0x00) {
-               PrintAndLog("Key type must be A or B");
+       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;
        }
                return 1;
        }

-       if (ctmp != 'A' && ctmp != 'a') keyType = 1;

        
        

-       for (i = 0; i < 6; i++) {
-               if (!isxdigit(param_getchar(Cmd, 2 + i))) break;
-
-               if (param_gethex(Cmd, 2 + i, keyBlock + 6 * i, 12)) {
-                       PrintAndLog("Key[%d] must include 12 HEX symbols", i);
-                       return 1;
-               }
-               keycnt = i + 1;
-       }
+       // Store the tag type
+       c.arg[0] = tagtype;

        
        

-       if (keycnt == 0) {
-               PrintAndLog("There is must be at least one key");
-               return 1;
-       }
+       // Retrieve the full 4 or 7 byte long uid 
+       uint64_t long_uid = param_get64ex(Cmd,1,0,16);

 
 

-       PrintAndLog("--block no:%02x key type:%02x key count:%d ", blockNo, keyType, keycnt);
-       
-       res = mfCheckKeys(blockNo, keyType, keycnt, keyBlock, &key64);
-       if (res !=1) {
-               if (!res)
-                       PrintAndLog("isOk:%02x valid key:%012llx", 1, key64);
-               else
-                       PrintAndLog("isOk:%02x", 0);
+       // 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 {
        } else {

-               PrintAndLog("Command execute timeout");
+               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;

 
 

+       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]);
+       }
+       
+       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 CmdHF14AMf1kSim(const char *Cmd)
-{
-       int i, temp;
-       uint8_t uid[4] = {0, 0, 0, 0};
+int CmdHF14ASnoop(const char *Cmd) {
+       int param = 0;

        
        

-       const char *cmdp        = Cmd;
-
-
-       if (strlen(Cmd)<3) {
-               PrintAndLog("Usage:  hf 14a mfsim  <uid (8 hex symbols)>");
-               PrintAndLog("           sample: hf 14a mfsim 0a0a0a0a ");
+       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("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;
        }       
        
                return 0;
        }       
        

-  // skip spaces
-       while (*cmdp==' ' || *cmdp=='\t') cmdp++;
-
-       if (strlen(cmdp) != 8) {
-               PrintAndLog("Length of UID must be 8 hex symbols");
-               return 0;
+       for (int i = 0; i < 2; i++) {
+               char ctmp = param_getchar(Cmd, i);
+               if (ctmp == 'c' || ctmp == 'C') param |= 0x01;
+               if (ctmp == 'r' || ctmp == 'R') param |= 0x02;

        }
        }

-       
-       for(i = 0; i < 4; i++) {
-               sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
-               uid[i] = temp & 0xff;
-               cmdp++;
-               cmdp++;
-       }       
-       PrintAndLog(" uid:%s ", sprint_hex(uid, 4));
-       
-  UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {0, 0, 0}};
-       memcpy(c.d.asBytes, uid, 6);
-  SendCommand(&c);

 
 

+  UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+  SendCommand(&c);

   return 0;
 }
 
   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;
+       uint16_t timeout=0;
+       uint8_t bTimeout=0;
+    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;
+    }

 
 

-int CmdHF14AReader(const char *Cmd)
-{
-       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 = uid + 12;
+    // 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;
+                               case 't':
+                                       bTimeout=1;
+                                       sscanf(cmd+i+2,"%d",&temp);
+                                       timeout = 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);
+                *buf=0;
+                               if (++datalen>sizeof(data)){
+                                       if (crc)
+                                               PrintAndLog("Buffer is full, we can't add CRC to your data");
+                                       break;
+                               }
+            }
+            continue;
+        }
+        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);
+        data[datalen++] = first;
+        data[datalen++] = second;
+    }

 
 

-       if(resp->arg[0] == 0) {
-               PrintAndLog("iso14443a card select failed");
-               return 0;
+    if(active || active_select)
+    {
+        c.arg[0] |= ISO14A_CONNECT;
+        if(active)
+            c.arg[0] |= ISO14A_NO_SELECT;
+    }
+       if(bTimeout){
+           #define MAX_TIMEOUT 624*105 // max timeout is 624 ms
+        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");
+        }

        }
        }

-
-       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]);
-       if(resp->arg[0] == 1)
-               PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
-       else
-               PrintAndLog("proprietary non-iso14443a card found, RATS not supported");
-
-       return resp->arg[0];
+    if(power)
+        c.arg[0] |= ISO14A_NO_DISCONNECT;
+    if(datalen>0)
+        c.arg[0] |= ISO14A_RAW;
+
+       // Max buffer is USB_CMD_DATA_SIZE
+    c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
+    memcpy(c.d.asBytes,data,datalen);
+
+    SendCommand(&c);
+
+    if (reply) {
+        if(active_select)
+            waitCmd(1);
+        if(datalen>0)
+            waitCmd(0);
+    } // if reply
+    return 0;

 }
 
 }
 

-// ## simulate iso14443a tag
-// ## greg - added ability to specify tag UID
-int CmdHF14ASim(const char *Cmd)
-{                                 
-
-  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);
-  }
-
-  // c.arg should be set to *Cmd or convert *Cmd to the correct format for a uid
-  UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a, {hi, lo, 0}};
-  PrintAndLog("Emulating 14443A TAG with UID %x%16x", hi, lo);
-  SendCommand(&c);
-  return 0;
-}
-
-int CmdHF14ASnoop(const char *Cmd)
+static void waitCmd(uint8_t iSelect)

 {
 {

-  UsbCommand c = {CMD_SNOOP_ISO_14443a};
-  SendCommand(&c);
-  return 0;
+    uint8_t *recv;
+    UsbCommand resp;
+    char *hexout;
+
+    if (WaitForResponseTimeout(CMD_ACK,&resp,10000)) {
+        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[] = 
 {
 }
 
 static command_t CommandTable[] = 
 {

-  {"help",   CmdHelp,          1, "This help"},
-  {"list",   CmdHF14AList,     0, "List ISO 14443a history"},
-  {"mifare", CmdHF14AMifare,   0, "Read out sector 0 parity error messages. param - <used card nonce>"},
-  {"mfrdbl", CmdHF14AMfRdBl,   0, "Read MIFARE classic block"},
-  {"mfrdsc", CmdHF14AMfRdSc,   0, "Read MIFARE classic sector"},
-  {"mfwrbl", CmdHF14AMfWrBl,   0, "Write MIFARE classic block"},
-  {"nested", CmdHF14AMfNested, 0, "Test nested authentication"},
-  {"chk",    CmdHF14AMfChk,    0, "Test block up to 8 keys"},
-  {"mfsim",  CmdHF14AMf1kSim,  0, "Simulate MIFARE 1k card - NOT WORKING!!!"},
-  {"reader", CmdHF14AReader,   0, "Act like an ISO14443 Type A reader"},
-  {"sim",    CmdHF14ASim,      0, "<UID> -- Fake ISO 14443a tag"},
-  {"snoop",  CmdHF14ASnoop,    0, "Eavesdrop ISO 14443 Type A"},
+  {"help",   CmdHelp,              1, "This help"},
+  {"list",   CmdHF14AList,         0, "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}
 };
 
   {NULL, NULL, 0, NULL}
 };
 

-int CmdHF14A(const char *Cmd)
-{
+int CmdHF14A(const char *Cmd) {

        // flush
        // flush

-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+       WaitForResponseTimeout(CMD_ACK,NULL,100);

 
        // parse
   CmdsParse(CommandTable, Cmd);
 
        // parse
   CmdsParse(CommandTable, Cmd);