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

index 24a66b883f888cfeca8521ce024c02d99b7db82f..480923d663a91f3de77531b67f2b5ddac4fcb2b9 100644 (file)

--- a/client/cmdhf14a.c

+++ b/client/cmdhf14a.c

@@ -16,6 +16,7 @@

#include <inttypes.h>

#include <string.h>

#include <unistd.h>

#include <inttypes.h>

#include <string.h>

#include <unistd.h>

+#include <ctype.h>

#include "util.h"

#include "util_posix.h"

#include "iso14443crc.h"

#include "util.h"

#include "util_posix.h"

#include "iso14443crc.h"

@@ -34,8 +35,13 @@

static int CmdHelp(const char *Cmd);

static int waitCmd(uint8_t iLen);

static int CmdHelp(const char *Cmd);

static int waitCmd(uint8_t iLen);

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

+typedef struct {

+ uint8_t uid;

+ char* desc;

+} manufactureName;

-const manufactureName manufactureMapping[] = {

+static const manufactureName manufactureMapping[] = {

// ID, "Vendor Country"

{ 0x01, "Motorola UK" },

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

// ID, "Vendor Country"

{ 0x01, "Motorola UK" },

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

@@ -132,29 +138,28 @@ int CmdHF14AList(const char *Cmd)

int CmdHF14AReader(const char *Cmd) {

uint32_t cm = ISO14A_CONNECT;

int CmdHF14AReader(const char *Cmd) {

uint32_t cm = ISO14A_CONNECT;

- bool disconnectAfter = false;

+ bool disconnectAfter = true;

int cmdp = 0;

while(param_getchar(Cmd, cmdp) != 0x00) {

switch(param_getchar(Cmd, cmdp)) {

case 'h':

case 'H':

int cmdp = 0;

while(param_getchar(Cmd, cmdp) != 0x00) {

switch(param_getchar(Cmd, cmdp)) {

case 'h':

case 'H':

- PrintAndLog("Usage: hf 14a reader [d] [3]");

- PrintAndLog(" d drop the signal field after command executed");

+ PrintAndLog("Usage: hf 14a reader [k|x] [3]");

+ PrintAndLog(" k keep the field active after command executed");

PrintAndLog(" x just drop the signal field");

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

return 0;

case '3':

cm |= ISO14A_NO_RATS;

break;

PrintAndLog(" x just drop the signal field");

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

return 0;

case '3':

cm |= ISO14A_NO_RATS;

break;

- case 'd':

- case 'D':

- disconnectAfter = true;

+ case 'k':

+ case 'K':

+ disconnectAfter = false;

break;

case 'x':

case 'X':

break;

case 'x':

case 'X':

- disconnectAfter = true;

- cm = cm - ISO14A_CONNECT;

+ cm &= ~ISO14A_CONNECT;

break;

default:

PrintAndLog("Unknown command.");

break;

default:

PrintAndLog("Unknown command.");

@@ -192,14 +197,19 @@ int CmdHF14AReader(const char *Cmd) {

PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));

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

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

}

- PrintAndLog("Card is selected. You can now start sending commands");

- } else {

+ if (!disconnectAfter) {

+ PrintAndLog("Card is selected. You can now start sending commands");

+ }

+ if (disconnectAfter) {

PrintAndLog("Field dropped.");

}

PrintAndLog("Field dropped.");

}

return 0;

}

return 0;

}

@@ -239,7 +249,7 @@ int CmdHF14AInfo(const char *Cmd)

PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));

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

+ PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);

bool isMifareClassic = true;

switch (card.sak) {

bool isMifareClassic = true;

switch (card.sak) {

@@ -644,7 +654,7 @@ void DropField() {

SendCommand(&c);

}

SendCommand(&c);

}

-int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen) {

+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {

uint16_t cmdc = 0;

if (activateField) {

uint16_t cmdc = 0;

if (activateField) {

@@ -656,8 +666,8 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea

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

// "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 timeout14a * 1.06 / 100, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106

- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_SET_TIMEOUT | cmdc, (datainlen & 0xFFFF), 1000 * 1000 * 1.06 / 100}};

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

memcpy(c.d.asBytes, datain, datainlen);

SendCommand(&c);

@@ -682,6 +692,12 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea

*dataoutlen = iLen - 2;

if (*dataoutlen < 0)

*dataoutlen = 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) {

memcpy(dataout, recv, *dataoutlen);

if(!iLen) {

@@ -715,6 +731,7 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea

return 0;

}

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;

int CmdHF14AAPDU(const char *cmd) {

uint8_t data[USB_CMD_DATA_SIZE];

int datalen = 0;

@@ -724,6 +741,7 @@ int CmdHF14AAPDU(const char *cmd) {

if (strlen(cmd) < 2) {

PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");

if (strlen(cmd) < 2) {

PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");

+ PrintAndLog("Command sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)");

PrintAndLog(" -s activate field and select card");

PrintAndLog(" -k leave the signal field ON after receive response");

PrintAndLog(" -t executes TLV decoder if it possible. TODO!!!!");

PrintAndLog(" -s activate field and select card");

PrintAndLog(" -k leave the signal field ON after receive response");

PrintAndLog(" -t executes TLV decoder if it possible. TODO!!!!");

@@ -752,7 +770,7 @@ int CmdHF14AAPDU(const char *cmd) {

return 1;

}

return 1;

}

- if (isxdigit(c)) {

+ if (isxdigit((unsigned char)c)) {

// len = data + PCB(1b) + CRC(2b)

switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {

case 1:

// len = data + PCB(1b) + CRC(2b)

switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {

case 1:

@@ -775,7 +793,7 @@ int CmdHF14AAPDU(const char *cmd) {

PrintAndLog(">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));

- int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, &datalen);

+ int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);

if (res)

return res;

if (res)

return res;

@@ -1009,7 +1027,7 @@ static command_t CommandTable[] =

{"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"},

{"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 ISO 1443-4 APDU to tag"},

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

};

{"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"},

{NULL, NULL, 0, NULL}

};