//-----------------------------------------------------------------------------
-// 2011, Merlok
+// 2011, 2017 Merlok
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// High frequency ISO14443A commands
//-----------------------------------------------------------------------------
+#include "cmdhf14a.h"
+
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <string.h>
#include <unistd.h>
+#include <ctype.h>
#include "util.h"
+#include "util_posix.h"
#include "iso14443crc.h"
-#include "data.h"
-#include "proxmark3.h"
+#include "comms.h"
#include "ui.h"
#include "cmdparser.h"
-#include "cmdhf14a.h"
#include "common.h"
#include "cmdmain.h"
#include "mifare.h"
+#include "cmdhfmfu.h"
+#include "mifarehost.h"
+#include "cliparser/cliparser.h"
+#include "emv/apduinfo.h"
+#include "emv/emvcore.h"
static int CmdHelp(const char *Cmd);
-static void waitCmd(uint8_t iLen);
+static int waitCmd(uint8_t iLen);
// structure and database for uid -> tagtype lookups
typedef struct {
char* desc;
} manufactureName;
-const manufactureName manufactureMapping[] = {
+static const manufactureName manufactureMapping[] = {
// ID, "Vendor Country"
{ 0x01, "Motorola UK" },
{ 0x02, "ST Microelectronics SA France" },
{ 0x00, "no tag-info available" } // must be the last entry
};
-
// get a product description based on the UID
// uid[8] tag uid
// returns description of the best match
return 0;
}
-int CmdHF14AReader(const char *Cmd)
+int CmdHF14AReader(const char *Cmd) {
+ uint32_t cm = ISO14A_CONNECT;
+ bool leaveSignalON = false;
+
+ CLIParserInit("hf 14a reader", "Executes ISO1443A anticollision-select group of commands.", NULL);
+ void* argtable[] = {
+ arg_param_begin,
+ arg_lit0("kK", "keep", "keep the field active after command executed"),
+ arg_lit0("xX", "drop", "just drop the signal field"),
+ arg_lit0("3", NULL, "ISO14443-3 select only (skip RATS)"),
+ arg_param_end
+ };
+ if (CLIParserParseString(Cmd, argtable, arg_getsize(argtable), true)){
+ CLIParserFree();
+ return 0;
+ }
+
+ leaveSignalON = arg_get_lit(1);
+ if (arg_get_lit(2)) {
+ cm = cm - ISO14A_CONNECT;
+ }
+ if (arg_get_lit(3)) {
+ cm |= ISO14A_NO_RATS;
+ }
+
+ CLIParserFree();
+
+ if (leaveSignalON)
+ cm |= ISO14A_NO_DISCONNECT;
+
+ UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
+ SendCommand(&c);
+
+ if (ISO14A_CONNECT & cm) {
+ 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, 3: proprietary Anticollision
+
+ if(select_status == 0) {
+ PrintAndLog("iso14443a card select failed");
+ return 1;
+ }
+
+ if(select_status == 3) {
+ PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
+ PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+ return 1;
+ }
+
+ PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+ PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+ PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+ if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+ PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
+ }
+ if (leaveSignalON) {
+ PrintAndLog("Card is selected. You can now start sending commands");
+ }
+ }
+
+ if (!leaveSignalON) {
+ PrintAndLog("Field dropped.");
+ }
+
+ return 0;
+}
+
+int CmdHF14AInfo(const char *Cmd)
{
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
SendCommand(&c);
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;
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]);
+ PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
+ bool isMifareClassic = true;
switch (card.sak) {
case 0x00:
+ isMifareClassic = false;
+
+ //***************************************test****************
+ // disconnect
+ c.arg[0] = 0;
+ c.arg[1] = 0;
+ c.arg[2] = 0;
+ SendCommand(&c);
+
+ 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;
+
+ 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) {
+ //PrintAndLog("iso14443a card select failed");
+ // disconnect
+ c.arg[0] = 0;
+ c.arg[1] = 0;
+ c.arg[2] = 0;
+ SendCommand(&c);
+ 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;
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;
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) {
// try to see if card responses to "chinese magic backdoor" commands.
- 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") );
+ (void)mfCIdentify();
+
+ if (isMifareClassic) {
+ switch(DetectClassicPrng()) {
+ case 0:
+ PrintAndLog("Prng detection: HARDENED (hardnested)");
+ break;
+ case 1:
+ PrintAndLog("Prng detection: WEAK");
+ break;
+ default:
+ PrintAndLog("Prng detection error.");
+ }
+ }
- // disconnect
- c.cmd = CMD_READER_ISO_14443a;
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
-
return select_status;
}
n = n > 0 ? n : 1;
PrintAndLog("Collecting %d UIDs", n);
- PrintAndLog("Start: %u", time(NULL));
+ PrintAndLog("Start: %" PRIu64, msclock()/1000);
// repeat n times
for (int i = 0; i < n; i++) {
// execute anticollision procedure
- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+ UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
SendCommand(&c);
UsbCommand resp;
PrintAndLog("%s", uid_string);
}
}
- PrintAndLog("End: %u", time(NULL));
+ PrintAndLog("End: %" PRIu64, msclock()/1000);
return 1;
}
// 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);
+ PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014" PRIx64 ")",long_uid);
// Store the second part
c.arg[2] = (long_uid & 0xffffffff);
long_uid >>= 32;
if (ctmp == 'r' || ctmp == 'R') param |= 0x02;
}
- UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
- SendCommand(&c);
- return 0;
+ UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+ 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;
- uint16_t numbits=0;
- uint32_t timeout=0;
- uint8_t bTimeout=0;
- char buf[5]="";
- int i=0;
- uint8_t data[USB_CMD_DATA_SIZE];
- uint16_t datalen=0;
- uint32_t 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 in ms");
- return 0;
- }
+void DropField() {
+ UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+ SendCommand(&c);
+}
- // 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;
- 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;
- }
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+ uint16_t cmdc = 0;
+
+ if (activateField) {
+ cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+ }
+ if (leaveSignalON)
+ cmdc |= ISO14A_NO_DISCONNECT;
+
+ // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
+ // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
+ // here length USB_CMD_DATA_SIZE=512
+ // timeout must be authomatically set by "get ATS"
+ UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | cmdc, (datainlen & 0xFFFF), 0}};
+ memcpy(c.d.asBytes, datain, datainlen);
+ SendCommand(&c);
+
+ uint8_t *recv;
+ UsbCommand resp;
+
+ if (activateField) {
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+ PrintAndLog("APDU ERROR: Proxmark connection timeout.");
+ return 1;
+ }
+ if (resp.arg[0] != 1) {
+ PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
+ return 1;
+ }
+ }
+
+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+ recv = resp.d.asBytes;
+ int iLen = resp.arg[0];
+
+ *dataoutlen = iLen - 2;
+ if (*dataoutlen < 0)
+ *dataoutlen = 0;
+
+ if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
+ PrintAndLog("APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+ return 2;
+ }
+
+ memcpy(dataout, recv, *dataoutlen);
+
+ if(!iLen) {
+ PrintAndLog("APDU ERROR: No APDU response.");
+ return 1;
+ }
- if(active || active_select)
- {
- c.arg[0] |= ISO14A_CONNECT;
- if(active)
- c.arg[0] |= ISO14A_NO_SELECT;
+ // check block TODO
+ if (iLen == -2) {
+ PrintAndLog("APDU ERROR: Block type mismatch.");
+ return 2;
+ }
+
+ // CRC Check
+ if (iLen == -1) {
+ PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
+ return 3;
+ }
+
+ // check apdu length
+ if (iLen < 4) {
+ PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
+ return 2;
+ }
+
+ } else {
+ PrintAndLog("APDU ERROR: Reply timeout.");
+ return 4;
}
+
+ return 0;
+}
+
+// ISO14443-4. 7. Half-duplex block transmission protocol
+int CmdHF14AAPDU(const char *cmd) {
+ uint8_t data[USB_CMD_DATA_SIZE];
+ int datalen = 0;
+ bool activateField = false;
+ bool leaveSignalON = false;
+ bool decodeTLV = false;
+
+ CLIParserInit("hf 14a apdu",
+ "Sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)",
+ "Sample:\n\thf 14a apdu -st 00A404000E325041592E5359532E444446303100\n");
+
+ void* argtable[] = {
+ arg_param_begin,
+ arg_lit0("sS", "select", "activate field and select card"),
+ arg_lit0("kK", "keep", "leave the signal field ON after receive response"),
+ arg_lit0("tT", "tlv", "executes TLV decoder if it possible"),
+ arg_strx1(NULL, NULL, "<APDU (hex)>", NULL),
+ arg_param_end
+ };
+ CLIExecWithReturn(cmd, argtable, false);
+
+ activateField = arg_get_lit(1);
+ leaveSignalON = arg_get_lit(2);
+ decodeTLV = arg_get_lit(3);
+ // len = data + PCB(1b) + CRC(2b)
+ CLIGetStrBLessWithReturn(4, data, &datalen, 1 + 2);
+
+
+ CLIParserFree();
+// PrintAndLog("---str [%d] %s", arg_get_str(4)->count, arg_get_str(4)->sval[0]);
+ PrintAndLog(">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
+
+ int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);
+
+ if (res)
+ return res;
+
+ PrintAndLog("<<<< %s", sprint_hex(data, datalen));
+
+ PrintAndLog("APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
+
+ // TLV decoder
+ if (decodeTLV && datalen > 4) {
+ TLVPrintFromBuffer(data, datalen - 2);
+ }
+
+ return 0;
+}
+
+int CmdHF14ACmdRaw(const char *cmd) {
+ UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+ bool reply=1;
+ bool crc = false;
+ bool power = false;
+ bool active = false;
+ bool active_select = false;
+ bool no_rats = false;
+ uint16_t numbits = 0;
+ bool bTimeout = false;
+ uint32_t timeout = 0;
+ bool topazmode = false;
+ uint8_t data[USB_CMD_DATA_SIZE];
+ int datalen = 0;
+
+ // extract parameters
+ CLIParserInit("hf 14a raw", "Send raw hex data to tag",
+ "Sample:\n"\
+ "\thf 14a raw -pa -b7 -t1000 52 -- execute WUPA\n"\
+ "\thf 14a raw -p 9320 -- anticollision\n"\
+ "\thf 14a raw -psc 60 00 -- select and mifare AUTH\n");
+ void* argtable[] = {
+ arg_param_begin,
+ arg_lit0("rR", "nreply", "do not read response"),
+ arg_lit0("cC", "crc", "calculate and append CRC"),
+ arg_lit0("pP", "power", "leave the signal field ON after receive"),
+ arg_lit0("aA", "active", "active signal field ON without select"),
+ arg_lit0("sS", "actives", "active signal field ON with select"),
+ arg_int0("bB", "bits", NULL, "number of bits to send. Useful for send partial byte"),
+ arg_int0("t", "timeout", NULL, "timeout in ms"),
+ arg_lit0("T", "topaz", "use Topaz protocol to send command"),
+ arg_lit0("3", NULL, "ISO14443-3 select only (skip RATS)"),
+ arg_strx1(NULL, NULL, "<data (hex)>", NULL),
+ arg_param_end
+ };
+ // defaults
+ arg_get_int(6) = 0;
+ arg_get_int(7) = 0;
+
+ if (CLIParserParseString(cmd, argtable, arg_getsize(argtable), false)){
+ CLIParserFree();
+ return 0;
+ }
+
+ reply = !arg_get_lit(1);
+ crc = arg_get_lit(2);
+ power = arg_get_lit(3);
+ active = arg_get_lit(4);
+ active_select = arg_get_lit(5);
+ numbits = arg_get_int(6) & 0xFFFF;
+ timeout = arg_get_int(7);
+ bTimeout = (timeout > 0);
+ topazmode = arg_get_lit(8);
+ no_rats = arg_get_lit(9);
+ // len = data + CRC(2b)
+ if (CLIParamHexToBuf(arg_get_str(10), data, sizeof(data) -2, &datalen)) {
+ CLIParserFree();
+ return 1;
+ }
+
+ CLIParserFree();
+
+ // logic
+ if(crc && datalen>0 && datalen<sizeof(data)-2)
+ {
+ uint8_t 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;
+ }
+
+ if(active || active_select)
+ {
+ c.arg[0] |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+ if(active)
+ c.arg[0] |= ISO14A_NO_SELECT;
+ }
if(bTimeout){
- #define MAX_TIMEOUT 40542464 // (2^32-1) * (8*16) / 13560000Hz * 1000ms/s =
- c.arg[0] |= ISO14A_SET_TIMEOUT;
- if(timeout > MAX_TIMEOUT) {
- timeout = MAX_TIMEOUT;
- PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
- }
+ #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+ c.arg[0] |= ISO14A_SET_TIMEOUT;
+ 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;
-
- // 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;
+
+ if(power) {
+ c.arg[0] |= ISO14A_NO_DISCONNECT;
+ }
+
+ if(datalen > 0) {
+ c.arg[0] |= ISO14A_RAW;
+ }
+
+ if(topazmode) {
+ c.arg[0] |= ISO14A_TOPAZMODE;
+ }
+
+ if(no_rats) {
+ c.arg[0] |= ISO14A_NO_RATS;
+ }
+
+ // Max buffer is USB_CMD_DATA_SIZE (512)
+ c.arg[1] = (datalen & 0xFFFF) | ((uint32_t)numbits << 16);
+ memcpy(c.d.asBytes,data,datalen);
+
+ SendCommand(&c);
+
+ if (reply) {
+ int res = 0;
+ if (active_select)
+ res = waitCmd(1);
+ if (!res && datalen > 0)
+ waitCmd(0);
+ } // if reply
+ return 0;
}
-static void waitCmd(uint8_t iSelect)
-{
+
+static int waitCmd(uint8_t iSelect) {
uint8_t *recv;
UsbCommand resp;
char *hexout;
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
recv = resp.d.asBytes;
- uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
- PrintAndLog("received %i octets",iLen);
+ uint8_t iLen = resp.arg[0];
+ if (iSelect){
+ iLen = resp.arg[1];
+ if (iLen){
+ PrintAndLog("Card selected. UID[%i]:", iLen);
+ } else {
+ PrintAndLog("Can't select card.");
+ }
+ } else {
+ PrintAndLog("received %i bytes:", iLen);
+ }
if(!iLen)
- return;
+ return 1;
hexout = (char *)malloc(iLen * 3 + 1);
if (hexout != NULL) {
for (int i = 0; i < iLen; i++) { // data in hex
free(hexout);
} else {
PrintAndLog("malloc failed your client has low memory?");
+ return 2;
}
} else {
PrintAndLog("timeout while waiting for reply.");
+ return 3;
}
+ return 0;
}
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
{"list", CmdHF14AList, 0, "[Deprecated] List ISO 14443a history"},
- {"reader", CmdHF14AReader, 0, "Act like an ISO14443 Type A reader"},
+ {"reader", CmdHF14AReader, 0, "Start acting like an ISO14443 Type A reader"},
+ {"info", CmdHF14AInfo, 0, "Reads card and shows information about it"},
{"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"},
+ {"apdu", CmdHF14AAPDU, 0, "Send an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol"},
{"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"},
{NULL, NULL, 0, NULL}
};
int CmdHF14A(const char *Cmd) {
- // flush
- WaitForResponseTimeout(CMD_ACK,NULL,100);
-
- // parse
- CmdsParse(CommandTable, Cmd);
- return 0;
+ (void)WaitForResponseTimeout(CMD_ACK,NULL,100);
+ CmdsParse(CommandTable, Cmd);
+ return 0;
}
int CmdHelp(const char *Cmd)
projects / proxmark3-svn / blobdiff