git.zerfleddert.de Git - proxmark3-svn/blobdiff

#include <stdio.h>

#include <stdlib.h>

#include <stdio.h>

#include <stdlib.h>

+#include <inttypes.h>

#include <string.h>

#include <unistd.h>

#include <string.h>

#include <unistd.h>

-#include <ctype.h>

#include "util.h"

+#include "util_posix.h"

#include "iso14443crc.h"

#include "data.h"

#include "iso14443crc.h"

#include "data.h"

-#include "proxusb.h"

+#include "proxmark3.h"

#include "ui.h"

#include "cmdparser.h"

#include "cmdhf14a.h"

#include "common.h"

#include "cmdmain.h"

#include "ui.h"

#include "cmdparser.h"

#include "cmdhf14a.h"

#include "common.h"

#include "cmdmain.h"

-#include "nonce2key/nonce2key.h"

-#include "nonce2key/crapto1.h"

+#include "mifare.h"

+#include "cmdhfmfu.h"

#include "mifarehost.h"

static int CmdHelp(const char *Cmd);

#include "mifarehost.h"

static int CmdHelp(const char *Cmd);

+static void waitCmd(uint8_t iLen);

+

+// structure and database for uid -> tagtype lookups

+typedef struct {

+ uint8_t uid;

+ char* desc;

+} manufactureName;

+

+const manufactureName manufactureMapping[] = {

+ // ID, "Vendor Country"

+ { 0x01, "Motorola UK" },

+ { 0x02, "ST Microelectronics SA France" },

+ { 0x03, "Hitachi, Ltd Japan" },

+ { 0x04, "NXP Semiconductors Germany" },

+ { 0x05, "Infineon Technologies AG Germany" },

+ { 0x06, "Cylink USA" },

+ { 0x07, "Texas Instrument France" },

+ { 0x08, "Fujitsu Limited Japan" },

+ { 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" },

+ { 0x0A, "NEC Japan" },

+ { 0x0B, "Oki Electric Industry Co. Ltd Japan" },

+ { 0x0C, "Toshiba Corp. Japan" },

+ { 0x0D, "Mitsubishi Electric Corp. Japan" },

+ { 0x0E, "Samsung Electronics Co. Ltd Korea" },

+ { 0x0F, "Hynix / Hyundai, Korea" },

+ { 0x10, "LG-Semiconductors Co. Ltd Korea" },

+ { 0x11, "Emosyn-EM Microelectronics USA" },

+ { 0x12, "INSIDE Technology France" },

+ { 0x13, "ORGA Kartensysteme GmbH Germany" },

+ { 0x14, "SHARP Corporation Japan" },

+ { 0x15, "ATMEL France" },

+ { 0x16, "EM Microelectronic-Marin SA Switzerland" },

+ { 0x17, "KSW Microtec GmbH Germany" },

+ { 0x18, "ZMD AG Germany" },

+ { 0x19, "XICOR, Inc. USA" },

+ { 0x1A, "Sony Corporation Japan Identifier Company Country" },

+ { 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },

+ { 0x1C, "Emosyn USA" },

+ { 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },

+ { 0x1E, "Magellan Technology Pty Limited Australia" },

+ { 0x1F, "Melexis NV BO Switzerland" },

+ { 0x20, "Renesas Technology Corp. Japan" },

+ { 0x21, "TAGSYS France" },

+ { 0x22, "Transcore USA" },

+ { 0x23, "Shanghai belling corp., ltd. China" },

+ { 0x24, "Masktech Germany Gmbh Germany" },

+ { 0x25, "Innovision Research and Technology Plc UK" },

+ { 0x26, "Hitachi ULSI Systems Co., Ltd. Japan" },

+ { 0x27, "Cypak AB Sweden" },

+ { 0x28, "Ricoh Japan" },

+ { 0x29, "ASK France" },

+ { 0x2A, "Unicore Microsystems, LLC Russian Federation" },

+ { 0x2B, "Dallas Semiconductor/Maxim USA" },

+ { 0x2C, "Impinj, Inc. USA" },

+ { 0x2D, "RightPlug Alliance USA" },

+ { 0x2E, "Broadcom Corporation USA" },

+ { 0x2F, "MStar Semiconductor, Inc Taiwan, ROC" },

+ { 0x30, "BeeDar Technology Inc. USA" },

+ { 0x31, "RFIDsec Denmark" },

+ { 0x32, "Schweizer Electronic AG Germany" },

+ { 0x33, "AMIC Technology Corp Taiwan" },

+ { 0x34, "Mikron JSC Russia" },

+ { 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },

+ { 0x36, "IDS Microchip AG Switzerland" },

+ { 0x37, "Kovio USA" },

+ { 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },

+ { 0x39, "Silicon Craft Technology Thailand" },

+ { 0x3A, "Advanced Film Device Inc. Japan" },

+ { 0x3B, "Nitecrest Ltd UK" },

+ { 0x3C, "Verayo Inc. USA" },

+ { 0x3D, "HID Global USA" },

+ { 0x3E, "Productivity Engineering Gmbh Germany" },

+ { 0x3F, "Austriamicrosystems AG (reserved) Austria" },

+ { 0x40, "Gemalto SA France" },

+ { 0x41, "Renesas Electronics Corporation Japan" },

+ { 0x42, "3Alogics Inc Korea" },

+ { 0x43, "Top TroniQ Asia Limited Hong Kong" },

+ { 0x44, "Gentag Inc (USA) USA" },

+ { 0x00, "no tag-info available" } // must be the last entry

+};

-int CmdHF14AList(const char *Cmd)

-{

- uint8_t got[1920];

- GetFromBigBuf(got, sizeof(got));

-

- PrintAndLog("recorded activity:");

- PrintAndLog(" ETU :rssi: who bytes");

- PrintAndLog("---------+----+----+-----------");

-

- int i = 0;

- int prev = -1;

-

- for (;;) {

- if(i >= 1900) {

- break;

- }

-

- bool isResponse;

- int timestamp = *((uint32_t *)(got+i));

- if (timestamp & 0x80000000) {

- timestamp &= 0x7fffffff;

- isResponse = 1;

- } else {

- isResponse = 0;

- }

-

- int metric = 0;

- int parityBits = *((uint32_t *)(got+i+4));

- // 4 bytes of additional information...

- // maximum of 32 additional parity bit information

- //

- // TODO:

- // at each quarter bit period we can send power level (16 levels)

- // or each half bit period in 256 levels.

-

- int len = got[i+8];

-

- if (len > 100) {

- break;

- }

- if (i + len >= 1900) {

- break;

- }

-

- uint8_t *frame = (got+i+9);

-

- // Break and stick with current result if buffer was not completely full

- if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }

-

- char line[1000] = "";

- int j;

- for (j = 0; j < len; j++) {

- int oddparity = 0x01;

- int k;

-

- for (k=0;k<8;k++) {

- oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);

- }

-

- //if((parityBits >> (len - j - 1)) & 0x01) {

- if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {

- sprintf(line+(j*4), "%02x! ", frame[j]);

- }

- else {

- sprintf(line+(j*4), "%02x ", frame[j]);

- }

-

- char *crc;

- crc = "";

- if (len > 2) {

- uint8_t b1, b2;

- for (j = 0; j < (len - 1); j++) {

- // gives problems... search for the reason..

- /*if(frame[j] == 0xAA) {

- switch(frame[j+1]) {

- case 0x01:

- crc = "[1] Two drops close after each other";

- break;

- case 0x02:

- crc = "[2] Potential SOC with a drop in second half of bitperiod";

- break;

- case 0x03:

- crc = "[3] Segment Z after segment X is not possible";

- break;

- case 0x04:

- crc = "[4] Parity bit of a fully received byte was wrong";

- break;

- default:

- crc = "[?] Unknown error";

- break;

- }

- break;

- }*/

- }

-

- if (strlen(crc)==0) {

- ComputeCrc14443(CRC_14443_A, frame, len-2, &b1, &b2);

- if (b1 != frame[len-2] || b2 != frame[len-1]) {

- crc = (isResponse & (len < 6)) ? "" : " !crc";

- } else {

- crc = "";

- }

- } else {

- crc = ""; // SHORT

- }

-

- char metricString[100];

- if (isResponse) {

- sprintf(metricString, "%3d", metric);

- } else {

- strcpy(metricString, " ");

- }

- PrintAndLog(" +%7d: %s: %s %s %s",

- (prev < 0 ? 0 : (timestamp - prev)),

- metricString,

- (isResponse ? "TAG" : " "), line, crc);

+// get a product description based on the UID

+// uid[8] tag uid

+// returns description of the best match

+char* getTagInfo(uint8_t uid) {

- prev = timestamp;

- i += (len + 9);

- }

- return 0;

-}

+ int i;

+ int len = sizeof(manufactureMapping) / sizeof(manufactureName);

+

+ for ( i = 0; i < len; ++i )

+ if ( uid == manufactureMapping[i].uid)

+ return manufactureMapping[i].desc;

-void iso14a_set_timeout(uint32_t timeout) {

- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_SET_TIMEOUT, 0, timeout}};

- SendCommand(&c);

+ //No match, return default

+ return manufactureMapping[len-1].desc;

}

-int CmdHF14AMifare(const char *Cmd)

+int CmdHF14AList(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}};

- 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. (");

-

+ PrintAndLog("Deprecated command, use 'hf list 14a' instead");

return 0;

}

return 0;

}

-int CmdHF14AMfWrBl(const char *Cmd)

+int CmdHF14AReader(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 c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};

+ SendCommand(&c);

+

+ UsbCommand resp;

+ WaitForResponse(CMD_ACK,&resp);

- char cmdp = 0x00;

+ iso14a_card_select_t card;

+ memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));

- 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");

+ 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) {

+ if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");

+ // disconnect

+ c.arg[0] = 0;

+ c.arg[1] = 0;

+ c.arg[2] = 0;

+ SendCommand(&c);

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");

+ 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);

+ return 0;

}

- 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;

-

+ 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]);

+

+ switch (card.sak) {

+ case 0x00:

+

+ //***************************************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;

+ }

- 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;

+ /* 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;

+ 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 (cmdp != 'A' && cmdp != 'a') keyType = 1;

- if (param_gethex(Cmd, 2, key, 12)) {

- PrintAndLog("Key must include 12 HEX symbols");

- return 1;

+

+ // 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]));

}

- 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;

+ // try to request ATS even if tag claims not to support it

+ if (select_status == 2) {

+ uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0

+ c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;

+ c.arg[1] = 2;

+ c.arg[2] = 0;

+ memcpy(c.d.asBytes, rats, 2);

+ SendCommand(&c);

+ WaitForResponse(CMD_ACK,&resp);

+

+ memcpy(card.ats, resp.d.asBytes, resp.arg[0]);

+ card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes

+ }

- if (isOK)

- PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));

- else

- PrintAndLog("isOk:%02x", isOK);

+ if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes

+ bool ta1 = 0, tb1 = 0, tc1 = 0;

+ int pos;

+

+ if (select_status == 2) {

+ PrintAndLog("SAK incorrectly claims that card doesn't support RATS");

+ }

+ PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));

+ PrintAndLog(" - TL : length is %d bytes", card.ats[0]);

+ if (card.ats[0] != card.ats_len - 2) {

+ PrintAndLog("ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);

+ }

+

+ if (card.ats[0] > 1) { // there is a format byte (T0)

+ ta1 = (card.ats[1] & 0x10) == 0x10;

+ tb1 = (card.ats[1] & 0x20) == 0x20;

+ tc1 = (card.ats[1] & 0x40) == 0x40;

+ int16_t fsci = card.ats[1] & 0x0f;

+ PrintAndLog(" - T0 : TA1 is%s present, TB1 is%s present, "

+ "TC1 is%s present, FSCI is %d (FSC = %ld)",

+ (ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),

+ fsci,

+ fsci < 5 ? (fsci - 2) * 8 :

+ fsci < 8 ? (fsci - 3) * 32 :

+ fsci == 8 ? 256 :

+ -1

+ );

+ }

+ pos = 2;

+ if (ta1) {

+ char dr[16], ds[16];

+ dr[0] = ds[0] = '\0';

+ if (card.ats[pos] & 0x10) strcat(ds, "2, ");

+ if (card.ats[pos] & 0x20) strcat(ds, "4, ");

+ if (card.ats[pos] & 0x40) strcat(ds, "8, ");

+ if (card.ats[pos] & 0x01) strcat(dr, "2, ");

+ if (card.ats[pos] & 0x02) strcat(dr, "4, ");

+ if (card.ats[pos] & 0x04) strcat(dr, "8, ");

+ if (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++;

+ }

+ if (tb1) {

+ uint32_t sfgi = card.ats[pos] & 0x0F;

+ uint32_t fwi = card.ats[pos] >> 4;

+ PrintAndLog(" - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",

+ (sfgi),

+ sfgi ? "" : "(not needed) ",

+ sfgi ? (1 << 12) << sfgi : 0,

+ fwi,

+ (1 << 12) << fwi

+ );

+ pos++;

+ }

+ if (tc1) {

+ PrintAndLog(" - TC1 : NAD is%s supported, CID is%s supported",

+ (card.ats[pos] & 0x01) ? "" : " NOT",

+ (card.ats[pos] & 0x02) ? "" : " NOT");

+ pos++;

+ }

+ if (card.ats[0] > pos) {

+ char *tip = "";

+ if (card.ats[0] - pos >= 7) {

+ if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {

+ tip = "-> MIFARE Plus X 2K or 4K";

+ } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {

+ tip = "-> MIFARE Plus S 2K or 4K";

+ }

+ PrintAndLog(" - HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);

+ if (card.ats[pos] == 0xC1) {

+ PrintAndLog(" c1 -> Mifare or (multiple) virtual cards of various type");

+ PrintAndLog(" %02x -> Length is %d bytes",

+ card.ats[pos + 1], card.ats[pos + 1]);

+ switch (card.ats[pos + 2] & 0xf0) {

+ 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(" 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;

+ }

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

+ PrintAndLog("proprietary non iso14443-4 card found, RATS not supported");

}

- return 0;

+

+ // try to see if card responses to "chinese magic backdoor" commands.

+ mfCIdentify();

+

+ return select_status;

}

-int CmdHF14AMfRdSc(const char *Cmd)

+// Collect ISO14443 Type A UIDs

+int CmdHF14ACUIDs(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;

+ // 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: %" PRIu64, msclock()/1000);

+ // repeat n times

+ for (int i = 0; i < n; i++) {

+ // execute anticollision procedure

+ UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};

+ SendCommand(&c);

+

+ UsbCommand resp;

+ WaitForResponse(CMD_ACK,&resp);

+

+ iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;

+

+ // check if command failed

+ if (resp.arg[0] == 0) {

+ PrintAndLog("Card select failed.");

+ } else {

+ char uid_string[20];

+ for (uint16_t i = 0; i < card->uidlen; i++) {

+ sprintf(&uid_string[2*i], "%02X", card->uid[i]);

+ }

+ PrintAndLog("%s", uid_string);

+ }

+ PrintAndLog("End: %" PRIu64, msclock()/1000);

- char cmdp = 0x00;

+ return 1;

+}

- 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 ");

- 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");

+// ## 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);

+

+ // 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;

}

- 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;

+ // Store the tag type

+ c.arg[0] = tagtype;

+

+ // Retrieve the full 4 or 7 byte long uid

+ uint64_t long_uid = param_get64ex(Cmd,1,0,16);

- PrintAndLog("isOk:%02x", isOK);

- if (isOK)

- for (i = 0; i < 2; i++) {

- PrintAndLog("data:%s", sprint_hex(data + i * 16, 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" PRIx64 ")",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("Command1 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;

- // 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));

- }

- } else {

- PrintAndLog("Command2 execute timeout");

+ 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 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");

+int CmdHF14ASnoop(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;

}

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;

+ for (int i = 0; i < 2; i++) {

+ ctmp = param_getchar(Cmd, i);

+ if (ctmp == 'c' || ctmp == 'C') param |= 0x01;

+ if (ctmp == 'r' || ctmp == 'R') param |= 0x02;

}

-

- 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 (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;

- }

+

+ 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}};

+ 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;

+ 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");

+ PrintAndLog(" -T use Topaz protocol to send command");

+ PrintAndLog(" -3 ISO14443-3 select only (skip RATS)");

+ return 0;

}

-

- 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;

- }

- for (i = 0; i < 16; i++) {

- PrintAndLog("cnt=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));

+

+ // 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 = false;

+ break;

+ case 'c':

+ crc = true;

+ break;

+ case 'p':

+ power = true;

+ break;

+ case 'a':

+ active = true;

+ break;

+ case 's':

+ active_select = true;

+ 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 = true;

+ sscanf(cmd+i+2,"%d",&temp);

+ timeout = temp;

+ i+=3;

+ while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }

+ i-=2;

+ break;

+ case 'T':

+ topazmode = true;

+ break;

+ case '3':

+ no_rats = true;

+ break;

+ default:

+ PrintAndLog("Invalid option");

+ return 0;

+ }

+ i+=2;

+ continue;

}

-

- // 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 ((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)-1) {

+ if (crc)

+ PrintAndLog("Buffer is full, we can't add CRC to your data");

+ break;

+ } else {

+ datalen++;

}

- }

-

- // 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;

- }

+ continue;

}

+ PrintAndLog("Invalid char on input");

+ return 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]);

+ 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);

}

- PrintAndLog("|---|----------------|---|----------------|---|");

-

- free(e_sector);

+ data[datalen++] = first;

+ data[datalen++] = second;

}

- return 0;

-}

-

-int CmdHF14AMfChk(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");

- return 1;

+ if(active || active_select)

+ {

+ c.arg[0] |= ISO14A_CONNECT;

+ if(active)

+ c.arg[0] |= ISO14A_NO_SELECT;

}

- 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;

+ 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");

}

- keycnt = i + 1;

- }

-

- if (keycnt == 0) {

- PrintAndLog("There is must be at least one key");

- return 1;

+ c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)

}

- 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);

- } else {

- PrintAndLog("Command execute timeout");

+ if(power) {

+ c.arg[0] |= ISO14A_NO_DISCONNECT;

}

- return 0;

-}

-

-int CmdHF14AMf1kSim(const char *Cmd)

-{

- int i, temp;

- uint8_t uid[4] = {0, 0, 0, 0};

-

- const char *cmdp = Cmd;

-

- if (strlen(Cmd)<3) {

- PrintAndLog("Usage: hf 14a mfsim <uid (8 hex symbols)>");

- PrintAndLog(" sample: hf 14a mfsim 0a0a0a0a ");

- return 0;

- }

-

- // skip spaces

- while (*cmdp==' ' || *cmdp=='\t') cmdp++;

+ if(datalen > 0) {

+ c.arg[0] |= ISO14A_RAW;

+ }

- if (strlen(cmdp) != 8) {

- PrintAndLog("Length of UID must be 8 hex symbols");

- return 0;

+ if(topazmode) {

+ c.arg[0] |= ISO14A_TOPAZMODE;

}

-

- for(i = 0; i < 4; i++) {

- sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);

- uid[i] = temp & 0xff;

- 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);

- return 0;

-}

+ 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);

-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;

-

- if(resp->arg[0] == 0) {

- PrintAndLog("iso14443a card select failed");

- return 0;

- }

- PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);

- PrintAndLog(" UID : %s", sprint_hex(uid, 12));

- PrintAndLog(" SAK : %02x [%d]", card->sak, resp->arg[0]);

- 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 (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,1500)) {

+ 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, "[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"},

+ {"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

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

+ WaitForResponseTimeout(CMD_ACK,NULL,100);

// parse

CmdsParse(CommandTable, Cmd);

// parse

CmdsParse(CommandTable, Cmd);