//-----------------------------------------------------------------------------
// 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,
#include "common.h"
#include "cmdmain.h"
#include "mifare.h"
+#include "cmdhfmf.h"
+#include "cmdhfmfu.h"
+#include "nonce2key/nonce2key.h"
+#include "cmdhf.h"
static int CmdHelp(const char *Cmd);
static void waitCmd(uint8_t iLen);
{ 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" },
{ 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" },
{ 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" },
{ 0x00, "no tag-info available" } // must be the last entry
};
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;
}
-void iso14a_set_timeout(uint32_t timeout) {
- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_SET_TIMEOUT, 0, timeout}};
- SendCommand(&c);
+int CmdHF14AList(const char *Cmd) {
+ //PrintAndLog("Deprecated command, use 'hf list 14a' instead");
+ CmdHFList("14a");
+ return 0;
}
-int CmdHF14AReader(const char *Cmd)
-{
+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));
- 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");
- // disconnect
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
+ if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
+ 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]);
+ SendCommand(&cDisconnect);
return 0;
}
- PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+ PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
- // Double & triple sized UID, can be mapped to a manufacturer.
- // HACK: does this apply for Ultralight cards?
- if ( card.uidlen > 4 ) {
- PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
- }
-
switch (card.sak) {
- case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
+ case 0x00:
+
+ // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
+ ul_switch_off_field();
+
+ uint32_t tagT = GetHF14AMfU_Type();
+ if (tagT != UL_ERROR)
+ ul_print_type(tagT, 0);
+ else
+ PrintAndLog("TYPE: Possible AZTEK (iso14443a compliant)");
+
+ // reconnect for further tests
+ c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
+ c.arg[1] = 0;
+ c.arg[2] = 0;
+ clearCommandBuffer();
+ SendCommand(&c);
+ UsbCommand resp;
+ WaitForResponse(CMD_ACK, &resp);
+
+ memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+ select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+
+ if(select_status == 0) {
+ ul_switch_off_field();
+ return 0;
+ }
+ 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;
default: ;
}
+ // Double & triple sized UID, can be mapped to a manufacturer.
+ if ( card.uidlen > 4 ) {
+ PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+ }
+
// try to request ATS even if tag claims not to support it
if (select_status == 2) {
uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
c.arg[1] = 2;
c.arg[2] = 0;
memcpy(c.d.asBytes, rats, 2);
+ clearCommandBuffer();
SendCommand(&c);
WaitForResponse(CMD_ACK,&resp);
- memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+ memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
}
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;
}
}
}
// try to see if card responses to "chinese magic backdoor" commands.
+ uint8_t isOK = 0;
+ clearCommandBuffer();
c.cmd = CMD_MIFARE_CIDENT;
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
- WaitForResponse(CMD_ACK,&resp);
- uint8_t isOK = resp.arg[0] & 0xff;
- PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+ isOK = resp.arg[0] & 0xff;
+
+ PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
// disconnect
- c.cmd = CMD_READER_ISO_14443a;
- c.arg[0] = 0;
- c.arg[1] = 0;
- c.arg[2] = 0;
- SendCommand(&c);
+ 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)
}
}
PrintAndLog("End: %u", time(NULL));
-
return 1;
}
// ## simulate iso14443a tag
// ## greg - added ability to specify tag UID
-int CmdHF14ASim(const char *Cmd)
-{
- UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{0,0,0}};
-
- // Retrieve the tag type
- uint8_t tagtype = param_get8ex(Cmd,0,0,10);
+int CmdHF14ASim(const char *Cmd) {
+ bool errors = FALSE;
+ uint8_t flags = 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];
- // 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;
+ while(param_getchar(Cmd, cmdp) != 0x00) {
+ switch(param_getchar(Cmd, cmdp)) {
+ case 'h':
+ case 'H':
+ return usage_hf_14a_sim();
+ case 't':
+ case 'T':
+ // Retrieve the tag type
+ tagtype = param_get8ex(Cmd, cmdp+1, 0, 10);
+ if (tagtype == 0)
+ errors = TRUE;
+ cmdp += 2;
+ break;
+ case 'u':
+ case 'U':
+ // Retrieve the full 4,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;
+ break;
+ }
+ if(errors) break;
}
+
+ //Validations
+ if (errors) return usage_hf_14a_sim();
+
+ if ( useUIDfromEML )
+ flags |= FLAG_UID_IN_EMUL;
- // Store the tag type
- c.arg[0] = tagtype;
+ UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
+ memcpy(c.d.asBytes, uid, uidlen>>1);
+ clearCommandBuffer();
+ SendCommand(&c);
+ UsbCommand resp;
- // Retrieve the full 4 or 7 byte long uid
- uint64_t long_uid = param_get64ex(Cmd,1,0,16);
-
- // Are we handling the (optional) second part uid?
- if (long_uid > 0xffffffff) {
- PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",long_uid);
- // Store the second part
- c.arg[2] = (long_uid & 0xffffffff);
- long_uid >>= 32;
- // Store the first part, ignore the first byte, it is replaced by cascade byte (0x88)
- c.arg[1] = (long_uid & 0xffffff);
- } else {
- PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",long_uid);
- // Only store the first part
- c.arg[1] = long_uid & 0xffffffff;
- }
-/*
- // At lease save the mandatory first part of the UID
- c.arg[0] = long_uid & 0xffffffff;
-
- 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]);
- }
+ PrintAndLog("Press pm3-button to abort simulation");
- 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;
+ 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 CmdHF14ASnoop(const char *Cmd) {
- int param = 0;
-
+int CmdHF14ASniff(const char *Cmd) {
+ int param = 0;
uint8_t ctmp = param_getchar(Cmd, 0) ;
- if (ctmp == 'h' || ctmp == 'H') {
- PrintAndLog("It get data from the field and saves it into command buffer.");
- PrintAndLog("Buffer accessible from command hf list 14a.");
- PrintAndLog("Usage: hf 14a snoop [c][r]");
- PrintAndLog("c - triggered by first data from card");
- PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
- PrintAndLog("sample: hf 14a snoop c r");
- return 0;
- }
+ if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
for (int i = 0; i < 2; i++) {
ctmp = param_getchar(Cmd, i);
}
UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+ clearCommandBuffer();
SendCommand(&c);
return 0;
}
int CmdHF14ACmdRaw(const char *cmd) {
UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
- uint8_t reply=1;
- uint8_t crc=0;
- uint8_t power=0;
- uint8_t active=0;
- uint8_t active_select=0;
+ bool reply=1;
+ bool crc = FALSE;
+ bool power = FALSE;
+ bool active = FALSE;
+ bool active_select = FALSE;
uint16_t numbits=0;
- uint16_t timeout=0;
- uint8_t bTimeout=0;
+ bool bTimeout = FALSE;
+ uint32_t timeout=0;
+ bool topazmode = FALSE;
char buf[5]="";
int i=0;
uint8_t data[USB_CMD_DATA_SIZE];
- unsigned int datalen=0, temp;
-
- if (strlen(cmd)<2) {
- PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
- PrintAndLog(" -r do not read response");
- PrintAndLog(" -c calculate and append CRC");
- PrintAndLog(" -p leave the signal field ON after receive");
- PrintAndLog(" -a active signal field ON without select");
- PrintAndLog(" -s active signal field ON with select");
- PrintAndLog(" -b number of bits to send. Useful for send partial byte");
- PrintAndLog(" -t timeout");
- return 0;
- }
+ uint16_t datalen=0;
+ uint32_t temp;
+
+ if (strlen(cmd)<2) return usage_hf_14a_raw();
// strip
while (*cmd==' ' || *cmd=='\t') cmd++;
if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
if (cmd[i]=='-') {
switch (cmd[i+1]) {
+ case 'H':
+ case 'h':
+ return usage_hf_14a_raw();
case 'r':
- reply=0;
+ reply = FALSE;
break;
case 'c':
- crc=1;
+ crc = TRUE;
break;
case 'p':
- power=1;
+ power = TRUE;
break;
case 'a':
- active=1;
+ active = TRUE;
break;
case 's':
- active_select=1;
+ active_select = TRUE;
break;
case 'b':
sscanf(cmd+i+2,"%d",&temp);
i-=2;
break;
case 't':
- bTimeout=1;
+ bTimeout = TRUE;
sscanf(cmd+i+2,"%d",&temp);
- timeout = temp & 0xFFFF;
+ timeout = temp;
i+=3;
while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
- i+=2;
+ i-=2;
+ break;
+ case 'T':
+ topazmode = TRUE;
break;
default:
- PrintAndLog("Invalid option");
- return 0;
+ return usage_hf_14a_raw();
}
i+=2;
continue;
sscanf(buf,"%x",&temp);
data[datalen]=(uint8_t)(temp & 0xff);
*buf=0;
- if (++datalen>sizeof(data)){
+ if (++datalen >= sizeof(data)){
if (crc)
PrintAndLog("Buffer is full, we can't add CRC to your data");
break;
PrintAndLog("Invalid char on input");
return 0;
}
+
if(crc && datalen>0 && datalen<sizeof(data)-2)
{
uint8_t first, second;
- ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+ if (topazmode) {
+ ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
+ } else {
+ ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+ }
data[datalen++] = first;
data[datalen++] = second;
}
if(active)
c.arg[0] |= ISO14A_NO_SELECT;
}
+
if(bTimeout){
- #define MAX_TIMEOUT 624*105 // max timeout is 624 ms
+ #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
c.arg[0] |= ISO14A_SET_TIMEOUT;
- c.arg[2] = timeout * 105; // each bit is about 9.4 us
- if(c.arg[2]>MAX_TIMEOUT) {
- c.arg[2] = MAX_TIMEOUT;
- PrintAndLog("Set timeout to 624 ms. The max we can wait for response");
+ if(timeout > MAX_TIMEOUT) {
+ timeout = MAX_TIMEOUT;
+ PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
}
+ c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
}
- if(power)
+
+ if(power) {
c.arg[0] |= ISO14A_NO_DISCONNECT;
- if(datalen>0)
+ }
+
+ if(datalen>0) {
c.arg[0] |= ISO14A_RAW;
-
+ }
+
+ if(topazmode) {
+ c.arg[0] |= ISO14A_TOPAZMODE;
+ }
+
// Max buffer is USB_CMD_DATA_SIZE
- c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
- 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);
if (reply) {
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"},
{"cuids", CmdHF14ACUIDs, 0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
{"sim", CmdHF14ASim, 0, "<UID> -- Simulate ISO 14443a tag"},
- {"snoop", CmdHF14ASnoop, 0, "Eavesdrop ISO 14443 Type A"},
+ {"sniff", CmdHF14ASniff, 0, "sniff ISO 14443 Type A traffic"},
{"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"},
{NULL, NULL, 0, NULL}
};
int CmdHF14A(const char *Cmd) {
- // flush
- WaitForResponseTimeout(CMD_ACK,NULL,100);
-
- // parse
- CmdsParse(CommandTable, Cmd);
- return 0;
+ clearCommandBuffer();
+ CmdsParse(CommandTable, Cmd);
+ return 0;
}
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
CmdsHelp(CommandTable);
return 0;
}
projects / proxmark3-svn / blobdiff