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

// High frequency commands

//-----------------------------------------------------------------------------

// High frequency commands

//-----------------------------------------------------------------------------

+#include <stdlib.h>

#include <stdio.h>

#include <string.h>

#include "proxmark3.h"

#include <stdio.h>

#include <string.h>

#include "proxmark3.h"

-#include "graph.h"

+#include "util.h"

+#include "data.h"

#include "ui.h"

+#include "iso14443crc.h"

+#include "parity.h"

+#include "cmdmain.h"

#include "cmdparser.h"

#include "cmdhf.h"

#include "cmdhf14a.h"

#include "cmdparser.h"

#include "cmdhf.h"

#include "cmdhf14a.h"

#include "cmdhficlass.h"

#include "cmdhfmf.h"

#include "cmdhfmfu.h"

#include "cmdhficlass.h"

#include "cmdhfmf.h"

#include "cmdhfmfu.h"

+#include "cmdhftopaz.h"

+#include "protocols.h"

+#include "emv/cmdemv.h"

static int CmdHelp(const char *Cmd);

return 0;

}

return 0;

}

-//The following data is taken from http://www.proxmark.org/forum/viewtopic.php?pid=13501#p13501

-/*

-ISO14443A (usually NFC tags)

- 26 (7bits) = REQA

- 30 = Read (usage: 30+1byte block number+2bytes ISO14443A-CRC - answer: 16bytes)

- A2 = Write (usage: A2+1byte block number+4bytes data+2bytes ISO14443A-CRC - answer: 0A [ACK] or 00 [NAK])

- 52 (7bits) = WUPA (usage: 52(7bits) - answer: 2bytes ATQA)

- 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)

- 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)

- 95 20 = Anticollision of cascade level2

- 95 70 = Select of cascade level2

- 50 00 = Halt (usage: 5000+2bytes ISO14443A-CRC - no answer from card)

-Mifare

- 60 = Authenticate with KeyA

- 61 = Authenticate with KeyB

- 40 (7bits) = Used to put Chinese Changeable UID cards in special mode (must be followed by 43 (8bits) - answer: 0A)

- C0 = Decrement

- C1 = Increment

- C2 = Restore

- B0 = Transfer

-Ultralight C

- A0 = Compatibility Write (to accomodate MIFARE commands)

- 1A = Step1 Authenticate

- AF = Step2 Authenticate

-

-ISO14443B

- 05 = REQB

- 1D = ATTRIB

- 50 = HALT

-SRIX4K (tag does not respond to 05)

- 06 00 = INITIATE

- 0E xx = SELECT ID (xx = Chip-ID)

- 0B = Get UID

- 08 yy = Read Block (yy = block number)

- 09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)

- 0C = Reset to Inventory

- 0F = Completion

- 0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)

-

-ISO15693

- MANDATORY COMMANDS (all ISO15693 tags must support those)

- 01 = Inventory (usage: 260100+2bytes ISO15693-CRC - answer: 12bytes)

- 02 = Stay Quiet

- OPTIONAL COMMANDS (not all tags support them)

- 20 = Read Block (usage: 0220+1byte block number+2bytes ISO15693-CRC - answer: 4bytes)

- 21 = Write Block (usage: 0221+1byte block number+4bytes data+2bytes ISO15693-CRC - answer: 4bytes)

- 22 = Lock Block

- 23 = Read Multiple Blocks (usage: 0223+1byte 1st block to read+1byte last block to read+2bytes ISO15693-CRC)

- 25 = Select

- 26 = Reset to Ready

- 27 = Write AFI

- 28 = Lock AFI

- 29 = Write DSFID

- 2A = Lock DSFID

- 2B = Get_System_Info (usage: 022B+2bytes ISO15693-CRC - answer: 14 or more bytes)

- 2C = Read Multiple Block Security Status (usage: 022C+1byte 1st block security to read+1byte last block security to read+2bytes ISO15693-CRC)

-

-EM Microelectronic CUSTOM COMMANDS

- A5 = Active EAS (followed by 1byte IC Manufacturer code+1byte EAS type)

- A7 = Write EAS ID (followed by 1byte IC Manufacturer code+2bytes EAS value)

- B8 = Get Protection Status for a specific block (followed by 1byte IC Manufacturer code+1byte block number+1byte of how many blocks after the previous is needed the info)

- E4 = Login (followed by 1byte IC Manufacturer code+4bytes password)

-NXP/Philips CUSTOM COMMANDS

- A0 = Inventory Read

- A1 = Fast Inventory Read

- A2 = Set EAS

- A3 = Reset EAS

- A4 = Lock EAS

- A5 = EAS Alarm

- A6 = Password Protect EAS

- A7 = Write EAS ID

- A8 = Read EPC

- B0 = Inventory Page Read

- B1 = Fast Inventory Page Read

- B2 = Get Random Number

- B3 = Set Password

- B4 = Write Password

- B5 = Lock Password

- B6 = Bit Password Protection

- B7 = Lock Page Protection Condition

- B8 = Get Multiple Block Protection Status

- B9 = Destroy SLI

- BA = Enable Privacy

- BB = 64bit Password Protection

- 40 = Long Range CMD (Standard ISO/TR7003:1990)

- */

-

-#define ICLASS_CMD_ACTALL 0x0A

-#define ICLASS_CMD_READ_OR_IDENTIFY 0x0C

-#define ICLASS_CMD_SELECT 0x81

-#define ICLASS_CMD_PAGESEL 0x84

-#define ICLASS_CMD_READCHECK_KD 0x88

-#define ICLASS_CMD_READCHECK_KC 0x18

-#define ICLASS_CMD_CHECK 0x05

-#define ICLASS_CMD_DETECT 0x0F

-#define ICLASS_CMD_HALT 0x00

-#define ICLASS_CMD_UPDATE 0x87

-#define ICLASS_CMD_ACT 0x8E

-#define ICLASS_CMD_READ4 0x06

-

-#define ISO14443A_CMD_REQA 0x26

-#define ISO14443A_CMD_READBLOCK 0x30

-#define ISO14443A_CMD_WUPA 0x52

-#define ISO14443A_CMD_ANTICOLL_OR_SELECT 0x93

-#define ISO14443A_CMD_ANTICOLL_OR_SELECT_2 0x95

-#define ISO14443A_CMD_WRITEBLOCK 0xA0 // or 0xA2 ?

-#define ISO14443A_CMD_HALT 0x50

-#define ISO14443A_CMD_RATS 0xE0

-

-#define MIFARE_AUTH_KEYA 0x60

-#define MIFARE_AUTH_KEYB 0x61

-#define MIFARE_MAGICMODE 0x40

-#define MIFARE_CMD_INC 0xC0

-#define MIFARE_CMD_DEC 0xC1

-#define MIFARE_CMD_RESTORE 0xC2

-#define MIFARE_CMD_TRANSFER 0xB0

-

-#define MIFARE_ULC_WRITE 0xA0

-#define MIFARE_ULC_AUTH_1 0x1A

-#define MIFARE_ULC_AUTH_2 0xAF

-

-/**

-06 00 = INITIATE

-0E xx = SELECT ID (xx = Chip-ID)

-0B = Get UID

-08 yy = Read Block (yy = block number)

-09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)

-0C = Reset to Inventory

-0F = Completion

-0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)

-**/

-

-#define ISO14443B_REQB 0x05

-#define ISO14443B_ATTRIB 0x1D

-#define ISO14443B_HALT 0x50

-#define ISO14443B_INITIATE 0x06

-#define ISO14443B_SELECT 0x0E

-#define ISO14443B_GET_UID 0x0B

-#define ISO14443B_READ_BLK 0x08

-#define ISO14443B_WRITE_BLK 0x09

-#define ISO14443B_RESET 0x0C

-#define ISO14443B_COMPLETION 0x0F

-#define ISO14443B_AUTHENTICATE 0x0A

-

-//First byte is 26

-#define ISO15693_INVENTORY 0x01

-#define ISO15693_STAYQUIET 0x02

-//First byte is 02

-#define ISO15693_READBLOCK 0x20

-#define ISO15693_WRITEBLOCK 0x21

-#define ISO15693_LOCKBLOCK 0x22

-#define ISO15693_READ_MULTI_BLOCK 0x23

-#define ISO15693_SELECT 0x25

-#define ISO15693_RESET_TO_READY 0x26

-#define ISO15693_WRITE_AFI 0x27

-#define ISO15693_LOCK_AFI 0x28

-#define ISO15693_WRITE_DSFID 0x29

-#define ISO15693_LOCK_DSFID 0x2A

-#define ISO15693_GET_SYSTEM_INFO 0x2B

-#define ISO15693_READ_MULTI_SECSTATUS 0x2C

-

-#define ISO_14443A 0

-#define ICLASS 1

-#define ISO_14443B 2

-

void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)

{

void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)

{

snprintf(exp,size,"ANTICOLL-2"); break;

}

snprintf(exp,size,"ANTICOLL-2"); break;

}

- case ISO14443A_CMD_REQA: snprintf(exp,size,"REQA"); break;

- case ISO14443A_CMD_READBLOCK: snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;

- case ISO14443A_CMD_WRITEBLOCK: snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;

- case ISO14443A_CMD_HALT: snprintf(exp,size,"HALT"); break;

- case ISO14443A_CMD_RATS: snprintf(exp,size,"RATS"); break;

- case MIFARE_CMD_INC: snprintf(exp,size,"INC(%d)",cmd[1]); break;

- case MIFARE_CMD_DEC: snprintf(exp,size,"DEC(%d)",cmd[1]); break;

- case MIFARE_CMD_RESTORE: snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;

- case MIFARE_CMD_TRANSFER: snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;

- case MIFARE_AUTH_KEYA: snprintf(exp,size,"AUTH-A(%d)",cmd[1]); break;

- case MIFARE_AUTH_KEYB: snprintf(exp,size,"AUTH-B(%d)",cmd[1]); break;

- case MIFARE_MAGICMODE: snprintf(exp,size,"MAGIC"); break;

- default: snprintf(exp,size,"?"); break;

+ case ISO14443A_CMD_REQA: snprintf(exp,size,"REQA"); break;

+ case ISO14443A_CMD_READBLOCK: snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;

+ case ISO14443A_CMD_WRITEBLOCK: snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;

+ case ISO14443A_CMD_HALT: snprintf(exp,size,"HALT"); break;

+ case ISO14443A_CMD_RATS: snprintf(exp,size,"RATS"); break;

+ case MIFARE_CMD_INC: snprintf(exp,size,"INC(%d)",cmd[1]); break;

+ case MIFARE_CMD_DEC: snprintf(exp,size,"DEC(%d)",cmd[1]); break;

+ case MIFARE_CMD_RESTORE: snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;

+ case MIFARE_CMD_TRANSFER: snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;

+ case MIFARE_AUTH_KEYA:{

+ if ( cmdsize > 3)

+ snprintf(exp,size,"AUTH-A(%d)",cmd[1]);

+ else

+ // case MIFARE_ULEV1_VERSION : both 0x60.

+ snprintf(exp,size,"EV1 VERSION");

+ break;

+ }

+ case MIFARE_AUTH_KEYB: snprintf(exp,size,"AUTH-B(%d)",cmd[1]); break;

+ case MIFARE_MAGICWUPC1: snprintf(exp,size,"MAGIC WUPC1"); break;

+ case MIFARE_MAGICWUPC2: snprintf(exp,size,"MAGIC WUPC2"); break;

+ case MIFARE_MAGICWIPEC: snprintf(exp,size,"MAGIC WIPEC"); break;

+ case MIFARE_ULC_AUTH_1: snprintf(exp,size,"AUTH "); break;

+ case MIFARE_ULC_AUTH_2: snprintf(exp,size,"AUTH_ANSW"); break;

+ case MIFARE_ULEV1_AUTH:

+ if ( cmdsize == 7 )

+ snprintf(exp,size,"PWD-AUTH KEY: 0x%02x%02x%02x%02x", cmd[1], cmd[2], cmd[3], cmd[4] );

+ else

+ snprintf(exp,size,"PWD-AUTH");

+ break;

+ case MIFARE_ULEV1_FASTREAD:{

+ if ( cmdsize >=3 && cmd[2] <= 0xE6)

+ snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]);

+ else

+ snprintf(exp,size,"?");

+ break;

+ }

+ case MIFARE_ULC_WRITE:{

+ if ( cmd[1] < 0x21 )

+ snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]);

+ else

+ snprintf(exp,size,"?");

+ break;

+ }

+ case MIFARE_ULEV1_READ_CNT:{

+ if ( cmd[1] < 5 )

+ snprintf(exp,size,"READ CNT(%d)",cmd[1]);

+ else

+ snprintf(exp,size,"?");

+ break;

+ }

+ case MIFARE_ULEV1_INCR_CNT:{

+ if ( cmd[1] < 5 )

+ snprintf(exp,size,"INCR(%d)",cmd[1]);

+ else

+ snprintf(exp,size,"?");

+ break;

+ }

+ case MIFARE_ULEV1_READSIG: snprintf(exp,size,"READ_SIG"); break;

+ case MIFARE_ULEV1_CHECKTEAR: snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;

+ case MIFARE_ULEV1_VCSL: snprintf(exp,size,"VCSL"); break;

+ default: snprintf(exp,size,"?"); break;

}

return;

}

return;

}

+

+void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)

+{

+ switch(cmd[0]) {

+ case TOPAZ_REQA :snprintf(exp, size, "REQA");break;

+ case TOPAZ_WUPA :snprintf(exp, size, "WUPA");break;

+ case TOPAZ_RID :snprintf(exp, size, "RID");break;

+ case TOPAZ_RALL :snprintf(exp, size, "RALL");break;

+ case TOPAZ_READ :snprintf(exp, size, "READ");break;

+ case TOPAZ_WRITE_E :snprintf(exp, size, "WRITE-E");break;

+ case TOPAZ_WRITE_NE :snprintf(exp, size, "WRITE-NE");break;

+ case TOPAZ_RSEG :snprintf(exp, size, "RSEG");break;

+ case TOPAZ_READ8 :snprintf(exp, size, "READ8");break;

+ case TOPAZ_WRITE_E8 :snprintf(exp, size, "WRITE-E8");break;

+ case TOPAZ_WRITE_NE8 :snprintf(exp, size, "WRITE-NE8");break;

+ default: snprintf(exp,size,"?"); break;

+ }

+}

+

/**

06 00 = INITIATE

0E xx = SELECT ID (xx = Chip-ID)

/**

06 00 = INITIATE

0E xx = SELECT ID (xx = Chip-ID)

}

/**

}

/**

- * @brief iso14443B_CRC_Ok Checks CRC in command or response

+ * @brief iso14443A_CRC_check Checks CRC in command or response

+ * @param isResponse

+ * @param data

+ * @param len

+ * @return 0 : CRC-command, CRC not ok

+ * 1 : CRC-command, CRC ok

+ * 2 : Not crc-command

+ */

+

+uint8_t iso14443A_CRC_check(bool isResponse, uint8_t* data, uint8_t len)

+{

+ uint8_t b1,b2;

+

+ if(len <= 2) return 2;

+

+ if(isResponse & (len < 6)) return 2;

+

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

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

+ return 0;

+ } else {

+ return 1;

+ }

+}

+

+/**

+ * @brief iso14443B_CRC_check Checks CRC in command or response

* @param isResponse

* @param data

* @param len

* @param isResponse

* @param data

* @param len

ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);

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

ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);

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

- return 0;

+ return 0;

+ } else {

+ return 1;

}

- return 1;

}

/**

}

/**

}

-uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles)

+

+bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)

{

- bool isResponse;

- uint16_t duration, data_len, parity_len;

+ return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);

+}

+

+bool next_record_is_response(uint16_t tracepos, uint8_t *trace)

+{

+ uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));

+

+ return(next_records_datalen & 0x8000);

+}

+

+bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen, uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len)

+{

+

+#define MAX_TOPAZ_READER_CMD_LEN 16

+

+ uint32_t last_timestamp = timestamp + *duration;

+

+ if ((*data_len != 1) || (frame[0] == TOPAZ_WUPA) || (frame[0] == TOPAZ_REQA)) return false;

+

+ memcpy(topaz_reader_command, frame, *data_len);

+

+ while (!is_last_record(*tracepos, trace, traceLen) && !next_record_is_response(*tracepos, trace)) {

+ uint32_t next_timestamp = *((uint32_t *)(trace + *tracepos));

+ *tracepos += sizeof(uint32_t);

+ uint16_t next_duration = *((uint16_t *)(trace + *tracepos));

+ *tracepos += sizeof(uint16_t);

+ uint16_t next_data_len = *((uint16_t *)(trace + *tracepos)) & 0x7FFF;

+ *tracepos += sizeof(uint16_t);

+ uint8_t *next_frame = (trace + *tracepos);

+ *tracepos += next_data_len;

+ if ((next_data_len == 1) && (*data_len + next_data_len <= MAX_TOPAZ_READER_CMD_LEN)) {

+ memcpy(topaz_reader_command + *data_len, next_frame, next_data_len);

+ *data_len += next_data_len;

+ last_timestamp = next_timestamp + next_duration;

+ } else {

+ // rewind and exit

+ *tracepos = *tracepos - next_data_len - sizeof(uint16_t) - sizeof(uint16_t) - sizeof(uint32_t);

+ break;

+ }

+ uint16_t next_parity_len = (next_data_len-1)/8 + 1;

+ *tracepos += next_parity_len;

+ }

+

+ *duration = last_timestamp - timestamp;

+

+ return true;

+}

+

+uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes)

+{

+ bool isResponse;

+ uint16_t data_len, parity_len;

+ uint32_t duration;

+ uint8_t topaz_reader_command[9];

uint32_t timestamp, first_timestamp, EndOfTransmissionTimestamp;

char explanation[30] = {0};

uint32_t timestamp, first_timestamp, EndOfTransmissionTimestamp;

char explanation[30] = {0};

uint8_t *parityBytes = trace + tracepos;

tracepos += parity_len;

uint8_t *parityBytes = trace + tracepos;

tracepos += parity_len;

+ if (protocol == TOPAZ && !isResponse) {

+ // topaz reader commands come in 1 or 9 separate frames with 7 or 8 Bits each.

+ // merge them:

+ if (merge_topaz_reader_frames(timestamp, &duration, &tracepos, traceLen, trace, frame, topaz_reader_command, &data_len)) {

+ frame = topaz_reader_command;

+ }

+

+ //Check the CRC status

+ uint8_t crcStatus = 2;

+

+ if (data_len > 2) {

+ switch (protocol) {

+ case ICLASS:

+ crcStatus = iclass_CRC_check(isResponse, frame, data_len);

+ break;

+ case ISO_14443B:

+ case TOPAZ:

+ crcStatus = iso14443B_CRC_check(isResponse, frame, data_len);

+ break;

+ case ISO_14443A:

+ crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);

+ break;

+ default:

+ break;

+ }

+ //0 CRC-command, CRC not ok

+ //1 CRC-command, CRC ok

+ //2 Not crc-command

//--- Draw the data column

//char line[16][110];

//--- Draw the data column

//char line[16][110];

for (int j = 0; j < data_len && j/16 < 16; j++) {

- int oddparity = 0x01;

- int k;

-

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

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

- }

-

uint8_t parityBits = parityBytes[j>>3];

- if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {

+ if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {

snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);

-

} else {

- snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);

+ snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x ", frame[j]);

+ }

+

+ }

+

+ if (markCRCBytes) {

+ if(crcStatus == 0 || crcStatus == 1)

+ {//CRC-command

+ char *pos1 = line[(data_len-2)/16]+(((data_len-2) % 16) * 4);

+ (*pos1) = '[';

+ char *pos2 = line[(data_len)/16]+(((data_len) % 16) * 4);

+ sprintf(pos2, "%c", ']');

}

+

if(data_len == 0)

{

if(data_len == 0){

if(data_len == 0)

{

if(data_len == 0){

}

//--- Draw the CRC column

}

//--- Draw the CRC column

- uint8_t crcStatus = 2;

-

- if (data_len > 2) {

- uint8_t b1, b2;

- if(protocol == ICLASS)

- {

- crcStatus = iclass_CRC_check(isResponse, frame, data_len);

-

- }else if (protocol == ISO_14443B)

- {

- crcStatus = iso14443B_CRC_check(isResponse, frame, data_len);

- }

- else if (protocol == ISO_14443A){//Iso 14443a

-

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

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

- if(!(isResponse & (data_len < 6)))

- {

- crcStatus = 0;

- }

- //0 CRC-command, CRC not ok

- //1 CRC-command, CRC ok

- //2 Not crc-command

char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " "));

EndOfTransmissionTimestamp = timestamp + duration;

if(!isResponse)

{

char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " "));

EndOfTransmissionTimestamp = timestamp + duration;

if(!isResponse)

{

- if(protocol == ICLASS)

- annotateIclass(explanation,sizeof(explanation),frame,data_len);

- else if (protocol == ISO_14443A)

- annotateIso14443a(explanation,sizeof(explanation),frame,data_len);

- else if(protocol == ISO_14443B)

- annotateIso14443b(explanation,sizeof(explanation),frame,data_len);

+ switch(protocol) {

+ case ICLASS: annotateIclass(explanation,sizeof(explanation),frame,data_len); break;

+ case ISO_14443A: annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;

+ case ISO_14443B: annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;

+ case TOPAZ: annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;

+ default: break;

+ }

}

int num_lines = MIN((data_len - 1)/16 + 1, 16);

for (int j = 0; j < num_lines ; j++) {

if (j == 0) {

}

int num_lines = MIN((data_len - 1)/16 + 1, 16);

for (int j = 0; j < num_lines ; j++) {

if (j == 0) {

- PrintAndLog(" %9d | %9d | %s | %-64s| %s| %s",

+ PrintAndLog(" %10d | %10d | %s |%-64s | %s| %s",

(timestamp - first_timestamp),

(EndOfTransmissionTimestamp - first_timestamp),

(isResponse ? "Tag" : "Rdr"),

(timestamp - first_timestamp),

(EndOfTransmissionTimestamp - first_timestamp),

(isResponse ? "Tag" : "Rdr"),

(j == num_lines-1) ? crc : " ",

(j == num_lines-1) ? explanation : "");

} else {

(j == num_lines-1) ? crc : " ",

(j == num_lines-1) ? explanation : "");

} else {

- PrintAndLog(" | | | %-64s| %s| %s",

+ PrintAndLog(" | | |%-64s | %s| %s",

line[j],

- (j == num_lines-1)?crc:" ",

+ (j == num_lines-1) ? crc : " ",

(j == num_lines-1) ? explanation : "");

}

(j == num_lines-1) ? explanation : "");

}

- if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;

+ if (is_last_record(tracepos, trace, traceLen)) return traceLen;

- bool next_isResponse = *((uint16_t *)(trace + tracepos + 6)) & 0x8000;

-

- if (showWaitCycles && !isResponse && next_isResponse) {

+ if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {

uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));

- if (next_timestamp != 0x44444444) {

- PrintAndLog(" %9d | %9d | %s | fdt (Frame Delay Time): %d",

- (EndOfTransmissionTimestamp - first_timestamp),

- (next_timestamp - first_timestamp),

- " ",

- (next_timestamp - EndOfTransmissionTimestamp));

- }

+ PrintAndLog(" %10d | %10d | %s | fdt (Frame Delay Time): %d",

+ (EndOfTransmissionTimestamp - first_timestamp),

+ (next_timestamp - first_timestamp),

+ " ",

+ (next_timestamp - EndOfTransmissionTimestamp));

}

return tracepos;

}

return tracepos;

int CmdHFList(const char *Cmd)

{

bool showWaitCycles = false;

int CmdHFList(const char *Cmd)

{

bool showWaitCycles = false;

+ bool markCRCBytes = false;

char type[40] = {0};

- int tlen = param_getstr(Cmd,0,type);

- char param = param_getchar(Cmd, 1);

+ int tlen = param_getstr(Cmd,0,type, sizeof(type));

+ char param1 = param_getchar(Cmd, 1);

+ char param2 = param_getchar(Cmd, 2);

bool errors = false;

uint8_t protocol = 0;

//Validate params

bool errors = false;

uint8_t protocol = 0;

//Validate params

- if(tlen == 0)

- {

+

+ if(tlen == 0) {

errors = true;

}

errors = true;

}

- if(param == 'h' || (param !=0 && param != 'f'))

- {

+

+ if(param1 == 'h'

+ || (param1 != 0 && param1 != 'f' && param1 != 'c')

+ || (param2 != 0 && param2 != 'f' && param2 != 'c')) {

errors = true;

}

errors = true;

}

- if(!errors)

- {

- if(strcmp(type, "iclass") == 0)

- {

+

+ if(!errors) {

+ if(strcmp(type, "iclass") == 0) {

protocol = ICLASS;

- }else if(strcmp(type, "14a") == 0)

- {

+ } else if(strcmp(type, "14a") == 0) {

protocol = ISO_14443A;

- }

- else if(strcmp(type, "14b") == 0)

- {

+ } else if(strcmp(type, "14b") == 0) {

protocol = ISO_14443B;

- }else if(strcmp(type,"raw")== 0)

- {

+ } else if(strcmp(type,"topaz")== 0) {

+ protocol = TOPAZ;

+ } else if(strcmp(type,"raw")== 0) {

protocol = -1;//No crc, no annotations

- }else{

+ } else {

errors = true;

}

if (errors) {

PrintAndLog("List protocol data in trace buffer.");

errors = true;

}

if (errors) {

PrintAndLog("List protocol data in trace buffer.");

- PrintAndLog("Usage: hf list <protocol> [f]");

+ PrintAndLog("Usage: hf list <protocol> [f][c]");

PrintAndLog(" f - show frame delay times as well");

+ PrintAndLog(" c - mark CRC bytes");

PrintAndLog("Supported <protocol> values:");

PrintAndLog(" raw - just show raw data without annotations");

PrintAndLog(" 14a - interpret data as iso14443a communications");

PrintAndLog(" 14b - interpret data as iso14443b communications");

PrintAndLog(" iclass - interpret data as iclass communications");

PrintAndLog("Supported <protocol> values:");

PrintAndLog(" raw - just show raw data without annotations");

PrintAndLog(" 14a - interpret data as iso14443a communications");

PrintAndLog(" 14b - interpret data as iso14443b communications");

PrintAndLog(" iclass - interpret data as iclass communications");

+ PrintAndLog(" topaz - interpret data as topaz communications");

PrintAndLog("");

PrintAndLog("example: hf list 14a f");

PrintAndLog("example: hf list iclass");

PrintAndLog("");

PrintAndLog("example: hf list 14a f");

PrintAndLog("example: hf list iclass");

}

- if (param == 'f') {

+ if (param1 == 'f' || param2 == 'f') {

showWaitCycles = true;

}

showWaitCycles = true;

}

+ if (param1 == 'c' || param2 == 'c') {

+ markCRCBytes = true;

+ }

uint8_t *trace;

uint16_t tracepos = 0;

uint8_t *trace;

uint16_t tracepos = 0;

PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");

PrintAndLog("iClass - Timings are not as accurate");

PrintAndLog("");

PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");

PrintAndLog("iClass - Timings are not as accurate");

PrintAndLog("");

- PrintAndLog(" Start | End | Src | Data (! denotes parity error) | CRC | Annotation |");

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

+ PrintAndLog(" Start | End | Src | Data (! denotes parity error) | CRC | Annotation |");

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

while(tracepos < traceLen)

{

while(tracepos < traceLen)

{

- tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles);

+ tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);

}

free(trace);

return 0;

}

free(trace);

return 0;

}

+int CmdHFSearch(const char *Cmd){

+ int ans = 0;

+ PrintAndLog("");

+ ans = CmdHF14AInfo("s");

+ if (ans > 0) {

+ PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");

+ return ans;

+ }

+ ans = HFiClassReader("", false, false);

+ if (ans) {

+ PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");

+ return ans;

+ }

+ ans = HF15Reader("", false);

+ if (ans) {

+ PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");

+ return ans;

+ }

+ //14b is longest test currently (and rarest chip type) ... put last

+ ans = HF14BInfo(false);

+ if (ans) {

+ PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");

+ return ans;

+ }

+ PrintAndLog("\nno known/supported 13.56 MHz tags found\n");

+ return 0;

+}

+

+int CmdHFSnoop(const char *Cmd)

+{

+ char * pEnd;

+ UsbCommand c = {CMD_HF_SNIFFER, {strtol(Cmd, &pEnd,0),strtol(pEnd, &pEnd,0),0}};

+ SendCommand(&c);

+ return 0;

+}

static command_t CommandTable[] =

{

static command_t CommandTable[] =

{

- {"help", CmdHelp, 1, "This help"},

- {"14a", CmdHF14A, 1, "{ ISO14443A RFIDs... }"},

- {"14b", CmdHF14B, 1, "{ ISO14443B RFIDs... }"},

- {"15", CmdHF15, 1, "{ ISO15693 RFIDs... }"},

- {"epa", CmdHFEPA, 1, "{ German Identification Card... }"},

- {"legic", CmdHFLegic, 0, "{ LEGIC RFIDs... }"},

- {"iclass", CmdHFiClass, 1, "{ ICLASS RFIDs... }"},

- {"mf", CmdHFMF, 1, "{ MIFARE RFIDs... }"},

- {"mfu", CmdHFMFUltra, 1, "{ MIFARE Ultralight RFIDs... }"},

- {"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},

- {"list", CmdHFList, 1, "List protocol data in trace buffer"},

- {NULL, NULL, 0, NULL}

+ {"help", CmdHelp, 1, "This help"},

+ {"14a", CmdHF14A, 1, "{ ISO14443A RFIDs... }"},

+ {"14b", CmdHF14B, 1, "{ ISO14443B RFIDs... }"},

+ {"15", CmdHF15, 1, "{ ISO15693 RFIDs... }"},

+ {"epa", CmdHFEPA, 1, "{ German Identification Card... }"},

+ {"emv", CmdHFEMV, 1, "{ EMV cards... }"},

+ {"legic", CmdHFLegic, 0, "{ LEGIC RFIDs... }"},

+ {"iclass", CmdHFiClass, 1, "{ ICLASS RFIDs... }"},

+ {"mf", CmdHFMF, 1, "{ MIFARE RFIDs... }"},

+ {"mfu", CmdHFMFUltra, 1, "{ MIFARE Ultralight RFIDs... }"},

+ {"topaz", CmdHFTopaz, 1, "{ TOPAZ (NFC Type 1) RFIDs... }"},

+ {"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},

+ {"list", CmdHFList, 1, "List protocol data in trace buffer"},

+ {"search", CmdHFSearch, 1, "Search for known HF tags [preliminary]"},

+ {"snoop", CmdHFSnoop, 0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},

+ {NULL, NULL, 0, NULL}

};

int CmdHF(const char *Cmd)

};

int CmdHF(const char *Cmd)