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

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c

index 214ff1eccbffee92dddc397ac792600aaa42021b..812db8ee0d85506630119de580162e2e4884dae4 100644 (file)

--- a/client/cmdhf14a.c

+++ b/client/cmdhf14a.c

@@ -11,6 +11,7 @@

#include <stdio.h>

#include <stdlib.h>

+#include <inttypes.h>

#include <string.h>

#include <unistd.h>

#include "util.h"

@@ -23,6 +24,7 @@

#include "common.h"

#include "cmdmain.h"

#include "mifare.h"

+#include "cmdhfmfu.h"

static int CmdHelp(const char *Cmd);

static void waitCmd(uint8_t iLen);

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

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

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

// disconnect

c.arg[0] = 0;

c.arg[1] = 0;

@@ -163,19 +165,68 @@ int CmdHF14AReader(const char *Cmd)

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:

+

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

+ }

+

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

@@ -192,6 +243,12 @@ int CmdHF14AReader(const char *Cmd)

default: ;

}

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

+ }

+

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

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

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

}

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

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

break;

case 0x01:

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

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

break;

case 0x02:

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

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

break;

case 0x03:

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

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

break;

case 0x04:

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

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

break;

}

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

@@ -374,7 +431,7 @@ int CmdHF14ACUIDs(const char *Cmd)

n = n > 0 ? n : 1;

PrintAndLog("Collecting %d UIDs", n);

- PrintAndLog("Start: %u", time(NULL));

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

// repeat n times

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

// execute anticollision procedure

@@ -397,7 +454,7 @@ int CmdHF14ACUIDs(const char *Cmd)

PrintAndLog("%s", uid_string);

}

- PrintAndLog("End: %u", time(NULL));

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

return 1;

}

@@ -434,7 +491,7 @@ int CmdHF14ASim(const char *Cmd)

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

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

@@ -513,14 +570,14 @@ int CmdHF14ASnoop(const char *Cmd) {

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 crc = false;

+ bool power = false;

+ bool active = false;

+ bool active_select = false;

uint16_t numbits = 0;

- bool bTimeout = FALSE;

+ bool bTimeout = false;

uint32_t timeout = 0;

- bool topazmode = FALSE;

+ bool topazmode = false;

char buf[5]="";

int i = 0;

uint8_t data[USB_CMD_DATA_SIZE];

@@ -549,19 +606,19 @@ int CmdHF14ACmdRaw(const char *cmd) {

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

switch (cmd[i+1]) {

case 'r':

- reply = FALSE;

+ reply = false;

break;

case 'c':

- crc = TRUE;

+ crc = true;

break;

case 'p':

- power = TRUE;

+ power = true;

break;

case 'a':

- active = TRUE;

+ active = true;

break;

case 's':

- active_select = TRUE;

+ active_select = true;

break;

case 'b':

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

@@ -571,7 +628,7 @@ int CmdHF14ACmdRaw(const char *cmd) {

i-=2;

break;

case 't':

- bTimeout = TRUE;

+ bTimeout = true;

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

timeout = temp;

i+=3;

@@ -579,7 +636,7 @@ int CmdHF14ACmdRaw(const char *cmd) {

i-=2;

break;

case 'T':

- topazmode = TRUE;

+ topazmode = true;

break;

default:

PrintAndLog("Invalid option");

@@ -640,14 +697,17 @@ 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);