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

index 9a761864b3fbc984ef21d839b0db886a69aeb647..81716db32c4e5d3842fe634af7b23c1b1884991f 100644 (file)

--- a/client/cmdhf14a.c

+++ b/client/cmdhf14a.c

@@ -141,7 +141,7 @@ int CmdHF14AReader(const char *Cmd)

iso14a_card_select_t card;

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

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

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

if(select_status == 0) {

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

@@ -352,16 +352,16 @@ int CmdHF14AReader(const char *Cmd)

PrintAndLog(" x0 -> <1 kByte");

break;

case 0x01:

PrintAndLog(" x0 -> <1 kByte");

break;

case 0x01:

- PrintAndLog(" x0 -> 1 kByte");

+ PrintAndLog(" x1 -> 1 kByte");

break;

case 0x02:

break;

case 0x02:

- PrintAndLog(" x0 -> 2 kByte");

+ PrintAndLog(" x2 -> 2 kByte");

break;

case 0x03:

break;

case 0x03:

- PrintAndLog(" x0 -> 4 kByte");

+ PrintAndLog(" x3 -> 4 kByte");

break;

case 0x04:

break;

case 0x04:

- PrintAndLog(" x0 -> 8 kByte");

+ PrintAndLog(" x4 -> 8 kByte");

break;

}

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

break;

}

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

@@ -565,20 +565,22 @@ int CmdHF14ASnoop(const char *Cmd) {

return 0;

}

return 0;

}

int CmdHF14ACmdRaw(const char *cmd) {

UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 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;

+ bool reply=1;

+ bool crc = FALSE;

+ bool power = FALSE;

+ bool active = FALSE;

+ bool active_select = FALSE;

+ uint16_t numbits = 0;

+ bool bTimeout = FALSE;

+ uint32_t timeout = 0;

+ bool topazmode = FALSE;

char buf[5]="";

- int i=0;

+ int i = 0;

uint8_t data[USB_CMD_DATA_SIZE];

- uint16_t datalen=0;

+ uint16_t datalen = 0;

uint32_t temp;

if (strlen(cmd)<2) {

uint32_t temp;

if (strlen(cmd)<2) {

@@ -590,9 +592,11 @@ int CmdHF14ACmdRaw(const char *cmd) {

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

}

return 0;

}

// strip

while (*cmd==' ' || *cmd=='\t') cmd++;

// strip

while (*cmd==' ' || *cmd=='\t') cmd++;

@@ -601,19 +605,19 @@ int CmdHF14ACmdRaw(const char *cmd) {

if (cmd[i]=='-') {

switch (cmd[i+1]) {

case 'r':

if (cmd[i]=='-') {

switch (cmd[i+1]) {

case 'r':

- reply=0;

+ reply = FALSE;

break;

case 'c':

break;

case 'c':

- crc=1;

+ crc = TRUE;

break;

case 'p':

break;

case 'p':

- power=1;

+ power = TRUE;

break;

case 'a':

break;

case 'a':

- active=1;

+ active = TRUE;

break;

case 's':

break;

case 's':

- active_select=1;

+ active_select = TRUE;

break;

case 'b':

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

break;

case 'b':

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

@@ -623,13 +627,16 @@ int CmdHF14ACmdRaw(const char *cmd) {

i-=2;

break;

case 't':

i-=2;

break;

case 't':

- bTimeout=1;

+ bTimeout = TRUE;

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

timeout = temp;

i+=3;

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

i-=2;

break;

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;

default:

PrintAndLog("Invalid option");

return 0;

default:

PrintAndLog("Invalid option");

return 0;

@@ -659,10 +666,15 @@ int CmdHF14ACmdRaw(const char *cmd) {

PrintAndLog("Invalid char on input");

return 0;

}

PrintAndLog("Invalid char on input");

return 0;

}

if(crc && datalen>0 && datalen<sizeof(data)-2)

{

uint8_t first, second;

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;

}

data[datalen++] = first;

data[datalen++] = second;

}

@@ -675,7 +687,7 @@ int CmdHF14ACmdRaw(const char *cmd) {

}

if(bTimeout){

}

if(bTimeout){

- #define MAX_TIMEOUT 40542464 // (2^32-1) * (8*16) / 13560000Hz * 1000ms/s =

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

c.arg[0] |= ISO14A_SET_TIMEOUT;

if(timeout > MAX_TIMEOUT) {

timeout = MAX_TIMEOUT;

@@ -683,11 +695,16 @@ 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)

}

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

// Max buffer is USB_CMD_DATA_SIZE

c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);

memcpy(c.d.asBytes,data,datalen);

@@ -703,6 +720,7 @@ int CmdHF14ACmdRaw(const char *cmd) {

return 0;

}

return 0;

}

static void waitCmd(uint8_t iSelect)

{

uint8_t *recv;

static void waitCmd(uint8_t iSelect)

{

uint8_t *recv;

@@ -712,7 +730,7 @@ static void waitCmd(uint8_t iSelect)

if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {

recv = resp.d.asBytes;

uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[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);

+ PrintAndLog("received %i octets", iLen);

if(!iLen)

return;

hexout = (char *)malloc(iLen * 3 + 1);

if(!iLen)

return;

hexout = (char *)malloc(iLen * 3 + 1);