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

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

index d279c9e640313eab4f0b54bfba7aa899dbac823c..16f7bb0f39f661c180723bd0c52bd1306407f8bd 100644 (file)

--- a/client/cmdhf.c

+++ b/client/cmdhf.c

@@ -62,19 +62,67 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)

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;

}

@@ -288,6 +336,34 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui

uint8_t *parityBytes = trace + tracepos;

tracepos += parity_len;

+ //Check the CRC status

+ 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

//--- Draw the data column

//char line[16][110];

@@ -301,7 +377,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui

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

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

@@ -309,6 +384,14 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui

} else {

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

}

+

+ }

+ if(crcStatus == 1)

+ {//CRC-command

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

+ (*pos1) = '[';

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

+ (*pos2) = ']';

}

if(data_len == 0)

{

@@ -317,33 +400,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui

}

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

@@ -492,6 +549,32 @@ int CmdHFList(const char *Cmd)

return 0;

}

+int CmdHFSearch(const char *Cmd){

+ int ans = 0;

+ PrintAndLog("");

+ ans = CmdHF14AReader("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 has issues currently...

+ //ans = CmdHF14BRead(Cmd);

+ //if (ans > 0) return ans;

+

+ return 0;

+}

static command_t CommandTable[] =

{

@@ -502,10 +585,11 @@ static command_t CommandTable[] =

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

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

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

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

{NULL, NULL, 0, NULL}

};