X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7838f4beba79370f94c7a3de2cf34278f5d481c8..57778a46308a250f4c9b1516aa8ca251d4e09cc5:/client/cmdhf14a.c
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 8a6e6afd..21c97fa2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1,5 +1,6 @@
//-----------------------------------------------------------------------------
// 2011, Merlok
+// 2014, Peter Fillmore
// 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,
@@ -23,10 +24,10 @@
#include "common.h"
#include "cmdmain.h"
#include "mifare.h"
+#include "cmdhfmf.h"
#include "cmdhfmfu.h"
#include "nonce2key/nonce2key.h"
-
-#define llx PRIx64
+#include "cmdhf.h"
static int CmdHelp(const char *Cmd);
static void waitCmd(uint8_t iLen);
@@ -64,7 +65,7 @@ const manufactureName manufactureMapping[] = {
{ 0x17, "KSW Microtec GmbH Germany" },
{ 0x18, "ZMD AG Germany" },
{ 0x19, "XICOR, Inc. USA" },
- { 0x1A, "Sony Corporation Japan Identifier Company Country" },
+ { 0x1A, "Sony Corporation Japan" },
{ 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
{ 0x1C, "Emosyn USA" },
{ 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
@@ -94,7 +95,7 @@ const manufactureName manufactureMapping[] = {
{ 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
{ 0x36, "IDS Microchip AG Switzerland" },
{ 0x37, "Kovio USA" },
- { 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
+ { 0x38, "HMT Microelectronic Ltd Switzerland" },
{ 0x39, "Silicon Craft Technology Thailand" },
{ 0x3A, "Advanced Film Device Inc. Japan" },
{ 0x3B, "Nitecrest Ltd UK" },
@@ -106,7 +107,8 @@ const manufactureName manufactureMapping[] = {
{ 0x41, "Renesas Electronics Corporation Japan" },
{ 0x42, "3Alogics Inc Korea" },
{ 0x43, "Top TroniQ Asia Limited Hong Kong" },
- { 0x44, "Gentag Inc (USA) USA" },
+ { 0x44, "Gentag Inc. USA" },
+ { 0x56, "Sensible Object. UK" },
{ 0x00, "no tag-info available" } // must be the last entry
};
@@ -127,19 +129,68 @@ char* getTagInfo(uint8_t uid) {
return manufactureMapping[len-1].desc;
}
-int CmdHF14AList(const char *Cmd)
-{
- PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+int usage_hf_14a_sim(void) {
+// PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n");
+ PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4,7 byte UID\n");
+ PrintAndLog("usage: hf 14a sim [h] t <type> u <uid> [x] [e] [v]");
+ PrintAndLog("options: ");
+ PrintAndLog(" h : This help");
+ PrintAndLog(" t : 1 = MIFARE Classic 1k");
+ PrintAndLog(" 2 = MIFARE Ultralight");
+ PrintAndLog(" 3 = MIFARE Desfire");
+ PrintAndLog(" 4 = ISO/IEC 14443-4");
+ PrintAndLog(" 5 = MIFARE Tnp3xxx");
+ PrintAndLog(" 6 = MIFARE Mini");
+ PrintAndLog(" 7 = AMIIBO (NTAG 215), pack 0x8080");
+ PrintAndLog(" 8 = MIFARE Classic 4k");
+// PrintAndLog(" u : 4, 7 or 10 byte UID");
+ PrintAndLog(" u : 4, 7 byte UID");
+ PrintAndLog(" x : (Optional) Performs the 'reader attack', nr/ar attack against a reader");
+ PrintAndLog(" e : (Optional) Fill simulator keys from found keys");
+ PrintAndLog(" v : (Optional) Verbose");
+ PrintAndLog("samples:");
+ PrintAndLog(" hf 14a sim t 1 u 11223344 x");
+ PrintAndLog(" hf 14a sim t 1 u 11223344");
+ PrintAndLog(" hf 14a sim t 1 u 11223344556677");
+// PrintAndLog(" hf 14a sim t 1 u 11223445566778899AA\n");
+ return 0;
+}
+int usage_hf_14a_sniff(void){
+ PrintAndLog("It get data from the field and saves it into command buffer.");
+ PrintAndLog("Buffer accessible from command 'hf list 14a'");
+ PrintAndLog("Usage: hf 14a sniff [c][r]");
+ PrintAndLog("c - triggered by first data from card");
+ PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
+ PrintAndLog("sample: hf 14a sniff c r");
+ return 0;
+}
+int usage_hf_14a_raw(void){
+ PrintAndLog("Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits> <0A 0B 0C ... hex>");
+ PrintAndLog(" -h this help");
+ PrintAndLog(" -r do not read response");
+ PrintAndLog(" -c calculate and append CRC");
+ PrintAndLog(" -p leave the signal field ON after receive");
+ PrintAndLog(" -a active signal field ON without select");
+ PrintAndLog(" -s active signal field ON with select");
+ PrintAndLog(" -b number of bits to send. Useful for send partial byte");
+ PrintAndLog(" -t timeout in ms");
+ PrintAndLog(" -T use Topaz protocol to send command");
return 0;
}
-int CmdHF14AReader(const char *Cmd)
-{
+int CmdHF14AList(const char *Cmd) {
+ //PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+ CmdHFList("14a");
+ return 0;
+}
+
+int CmdHF14AReader(const char *Cmd) {
+ UsbCommand cDisconnect = {CMD_READER_ISO_14443a, {0,0,0}};
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+ clearCommandBuffer();
SendCommand(&c);
-
UsbCommand resp;
- WaitForResponse(CMD_ACK,&resp);
+ WaitForResponse(CMD_ACK, &resp);
iso14a_card_select_t card;
memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
@@ -148,22 +199,14 @@ int CmdHF14AReader(const char *Cmd)
if(select_status == 0) {
if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
- // disconnect
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
+ SendCommand(&cDisconnect);
return 0;
}
if(select_status == 3) {
PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
- // disconnect
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
+ SendCommand(&cDisconnect);
return 0;
}
@@ -174,21 +217,23 @@ int CmdHF14AReader(const char *Cmd)
switch (card.sak) {
case 0x00:
- //***************************************test****************
+ // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
ul_switch_off_field();
uint32_t tagT = GetHF14AMfU_Type();
- ul_print_type(tagT, 0);
+ if (tagT != UL_ERROR)
+ ul_print_type(tagT, 0);
+ else
+ PrintAndLog("TYPE: Possible AZTEK (iso14443a compliant)");
- //reconnect for further tests
+ // reconnect for further tests
c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
c.arg[1] = 0;
c.arg[2] = 0;
-
+ clearCommandBuffer();
SendCommand(&c);
-
UsbCommand resp;
- WaitForResponse(CMD_ACK,&resp);
+ WaitForResponse(CMD_ACK, &resp);
memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
@@ -198,27 +243,6 @@ int CmdHF14AReader(const char *Cmd)
ul_switch_off_field();
return 0;
}
-
- /* orig
- // check if the tag answers to GETVERSION (0x60)
- c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
- c.arg[1] = 1;
- c.arg[2] = 0;
- c.d.asBytes[0] = 0x60;
- SendCommand(&c);
- WaitForResponse(CMD_ACK,&resp);
-
- uint8_t version[10] = {0};
- memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
- uint8_t len = resp.arg[0] & 0xff;
- switch ( len){
- // todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
- // UL-EV1, size, check version[6] == 0x0b (smaller) 0x0b * 4 == 48
- case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128); break;
- case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
- case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;
- }
- */
break;
case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
@@ -248,6 +272,7 @@ int CmdHF14AReader(const char *Cmd)
c.arg[1] = 2;
c.arg[2] = 0;
memcpy(c.d.asBytes, rats, 2);
+ clearCommandBuffer();
SendCommand(&c);
WaitForResponse(CMD_ACK,&resp);
@@ -333,59 +358,29 @@ int CmdHF14AReader(const char *Cmd)
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;
+ 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;
+ case 0x00: PrintAndLog(" x0 -> <1 kByte"); break;
+ case 0x01: PrintAndLog(" x1 -> 1 kByte"); break;
+ case 0x02: PrintAndLog(" x2 -> 2 kByte"); break;
+ case 0x03: PrintAndLog(" x3 -> 4 kByte"); break;
+ case 0x04: PrintAndLog(" x4 -> 8 kByte"); break;
}
switch (card.ats[pos + 3] & 0xf0) {
- case 0x00:
- PrintAndLog(" 0x -> Engineering sample");
- break;
- case 0x20:
- PrintAndLog(" 2x -> Released");
- break;
+ 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;
+ 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;
+ 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;
}
}
}
@@ -395,28 +390,30 @@ int CmdHF14AReader(const char *Cmd)
// try to see if card responses to "chinese magic backdoor" commands.
+ uint8_t isGeneration = 0;
+ clearCommandBuffer();
c.cmd = CMD_MIFARE_CIDENT;
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
- WaitForResponse(CMD_ACK,&resp);
- uint8_t isOK = resp.arg[0] & 0xff;
- PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+ isGeneration = resp.arg[0] & 0xff;
- // disconnect
- c.cmd = CMD_READER_ISO_14443a;
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
+ switch( isGeneration ){
+ case 1: PrintAndLog("Answers to magic commands (GEN 1a): YES"); break;
+ case 2: PrintAndLog("Answers to magic commands (GEN 1b): YES"); break;
+ //case 4: PrintAndLog("Answers to magic commands (GEN 2): YES"); break;
+ default: PrintAndLog("Answers to magic commands: NO"); break;
+ }
+ // disconnect
+ SendCommand(&cDisconnect);
return select_status;
}
// Collect ISO14443 Type A UIDs
-int CmdHF14ACUIDs(const char *Cmd)
-{
+int CmdHF14ACUIDs(const char *Cmd) {
// requested number of UIDs
int n = atoi(Cmd);
// collect at least 1 (e.g. if no parameter was given)
@@ -447,47 +444,25 @@ int CmdHF14ACUIDs(const char *Cmd)
}
}
PrintAndLog("End: %u", time(NULL));
-
return 1;
}
-
-static int usage_hf_14a_sim(void)
-{
- PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
- PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
- PrintAndLog(" Options : ");
- PrintAndLog(" h : this help");
- PrintAndLog(" t : 1 = MIFARE Classic");
- PrintAndLog(" 2 = MIFARE Ultralight");
- PrintAndLog(" 3 = MIFARE Desfire");
- PrintAndLog(" 4 = ISO/IEC 14443-4");
- PrintAndLog(" 5 = MIFARE Tnp3xxx");
- PrintAndLog(" 6 = MIFARE Mini");
- PrintAndLog(" 7 = AMIIBO (NTAG 215), pack 0x8080");
- PrintAndLog(" u : 4 or 7 byte UID");
- PrintAndLog(" x : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
- PrintAndLog("\n sample : hf 14a sim t 1 u 1122344");
- PrintAndLog(" : hf 14a sim t 1 u 1122344 x\n");
- return 0;
-}
-
// ## simulate iso14443a tag
// ## greg - added ability to specify tag UID
-int CmdHF14ASim(const char *Cmd)
-{
+int CmdHF14ASim(const char *Cmd) {
bool errors = FALSE;
uint8_t flags = 0;
- uint8_t tagtype = 1;
- uint64_t uid = 0;
+ uint8_t tagtype = 1;
uint8_t cmdp = 0;
+ uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
+ int uidlen = 0;
+ bool useUIDfromEML = TRUE;
+ bool setEmulatorMem = FALSE;
+ bool verbose = FALSE;
+ nonces_t data[1];
- clearCommandBuffer();
-
- while(param_getchar(Cmd, cmdp) != 0x00)
- {
- switch(param_getchar(Cmd, cmdp))
- {
+ while(param_getchar(Cmd, cmdp) != 0x00) {
+ switch(param_getchar(Cmd, cmdp)) {
case 'h':
case 'H':
return usage_hf_14a_sim();
@@ -496,33 +471,43 @@ int CmdHF14ASim(const char *Cmd)
// Retrieve the tag type
tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
if (tagtype == 0)
- errors = true;
+ errors = TRUE;
cmdp += 2;
break;
case 'u':
case 'U':
- // Retrieve the full 4 or 7 byte long uid
- uid = param_get64ex(Cmd, cmdp+1, 0, 16);
- if (uid == 0 )
- errors = TRUE;
-
- if (uid > 0xffffffff) {
- PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",uid);
- flags |= FLAG_7B_UID_IN_DATA;
- } else {
- PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",uid);
- flags |= FLAG_4B_UID_IN_DATA;
+ // Retrieve the full 4,7,10 byte long uid
+ param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);
+ switch(uidlen) {
+ //case 20: flags |= FLAG_10B_UID_IN_DATA; break;
+ case 14: flags |= FLAG_7B_UID_IN_DATA; break;
+ case 8: flags |= FLAG_4B_UID_IN_DATA; break;
+ default: errors = TRUE; break;
+ }
+ if (!errors) {
+ PrintAndLog("Emulating ISO/IEC 14443 type A tag with %d byte UID (%s)", uidlen>>1, sprint_hex(uid, uidlen>>1));
+ useUIDfromEML = FALSE;
}
cmdp += 2;
break;
+ case 'v':
+ case 'V':
+ verbose = TRUE;
+ cmdp++;
+ break;
case 'x':
case 'X':
flags |= FLAG_NR_AR_ATTACK;
cmdp++;
break;
+ case 'e':
+ case 'E':
+ setEmulatorMem = TRUE;
+ cmdp++;
+ break;
default:
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
- errors = true;
+ errors = TRUE;
break;
}
if(errors) break;
@@ -531,46 +516,33 @@ int CmdHF14ASim(const char *Cmd)
//Validations
if (errors) return usage_hf_14a_sim();
- PrintAndLog("Press pm3-button to abort simulation");
+ if ( useUIDfromEML )
+ flags |= FLAG_UID_IN_EMUL;
- UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
-
- num_to_bytes(uid, 7, c.d.asBytes);
+ UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
+ memcpy(c.d.asBytes, uid, uidlen>>1);
+ clearCommandBuffer();
SendCommand(&c);
-
- uint8_t data[40];
- uint8_t key[6];
UsbCommand resp;
- while(!ukbhit()){
- if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
- if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
- memset(data, 0x00, sizeof(data));
- memset(key, 0x00, sizeof(key));
- int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
- memcpy(data, resp.d.asBytes, len);
- tryMfk32(uid, data, key);
- tryMfk32_moebius(uid, data, key);
- //tryMfk64(uid, data, key);
- PrintAndLog("--");
- }
- }
+
+ PrintAndLog("Press pm3-button to abort simulation");
+
+ while( !ukbhit() ){
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
+ if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
+ if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
+
+ memcpy(data, resp.d.asBytes, sizeof(data) );
+ readerAttack(data[0], setEmulatorMem, verbose);
}
+ showSectorTable();
return 0;
}
int CmdHF14ASniff(const char *Cmd) {
- int param = 0;
-
+ int param = 0;
uint8_t ctmp = param_getchar(Cmd, 0) ;
- if (ctmp == 'h' || ctmp == 'H') {
- PrintAndLog("It get data from the field and saves it into command buffer.");
- PrintAndLog("Buffer accessible from command 'hf list 14a'");
- PrintAndLog("Usage: hf 14a sniff [c][r]");
- PrintAndLog("c - triggered by first data from card");
- PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
- PrintAndLog("sample: hf 14a sniff c r");
- return 0;
- }
+ if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
for (int i = 0; i < 2; i++) {
ctmp = param_getchar(Cmd, i);
@@ -579,11 +551,11 @@ int CmdHF14ASniff(const char *Cmd) {
}
UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+ clearCommandBuffer();
SendCommand(&c);
return 0;
}
-
int CmdHF14ACmdRaw(const char *cmd) {
UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
bool reply=1;
@@ -601,19 +573,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
uint16_t datalen=0;
uint32_t temp;
- if (strlen(cmd)<2) {
- PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-t] <milliseconds> [-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");
- PrintAndLog(" -t timeout in ms");
- PrintAndLog(" -T use Topaz protocol to send command");
- return 0;
- }
-
+ if (strlen(cmd)<2) return usage_hf_14a_raw();
// strip
while (*cmd==' ' || *cmd=='\t') cmd++;
@@ -622,6 +582,9 @@ int CmdHF14ACmdRaw(const char *cmd) {
if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
if (cmd[i]=='-') {
switch (cmd[i+1]) {
+ case 'H':
+ case 'h':
+ return usage_hf_14a_raw();
case 'r':
reply = FALSE;
break;
@@ -656,8 +619,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
topazmode = TRUE;
break;
default:
- PrintAndLog("Invalid option");
- return 0;
+ return usage_hf_14a_raw();
}
i+=2;
continue;
@@ -714,18 +676,23 @@ int CmdHF14ACmdRaw(const char *cmd) {
c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
}
- if(power)
+ if(power) {
c.arg[0] |= ISO14A_NO_DISCONNECT;
-
- if(datalen>0)
+ }
+
+ if(datalen>0) {
c.arg[0] |= ISO14A_RAW;
-
- if(topazmode)
+ }
+
+ if(topazmode) {
c.arg[0] |= ISO14A_TOPAZMODE;
-
+ }
+
// Max buffer is USB_CMD_DATA_SIZE
- c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
- memcpy(c.d.asBytes,data,datalen);
+ datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
+
+ c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16);
+ memcpy(c.d.asBytes, data, datalen);
clearCommandBuffer();
SendCommand(&c);
@@ -739,36 +706,23 @@ int CmdHF14ACmdRaw(const char *cmd) {
return 0;
}
-
static void waitCmd(uint8_t iSelect)
{
- uint8_t *recv;
UsbCommand resp;
- char *hexout;
+ uint16_t len = 0;
- 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);
- if(!iLen)
+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+ len = iSelect ? (resp.arg[1] & 0xffff) : (resp.arg[0] & 0xffff);
+ PrintAndLog("received %i octets", len);
+ if(!len)
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?");
- }
+ PrintAndLog("%s", sprint_hex(resp.d.asBytes, len) );
} else {
PrintAndLog("timeout while waiting for reply.");
}
}
-static command_t CommandTable[] =
-{
+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"},
@@ -780,16 +734,12 @@ static command_t CommandTable[] =
};
int CmdHF14A(const char *Cmd) {
- // flush
- WaitForResponseTimeout(CMD_ACK,NULL,100);
-
- // parse
+ clearCommandBuffer();
CmdsParse(CommandTable, Cmd);
return 0;
}
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
CmdsHelp(CommandTable);
return 0;
}