X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ad5bc8cc8c0a6573d6b2c7bc58bf94f7ab66ad4c..f8ff1483eb53d151822d45ea65c08511edecd2d8:/client/cmdhf.c?ds=inline
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 95d4f53a..031f065e 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -370,23 +370,54 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
// 1 = read
// 0 = write
// Quite simpel tag
-void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-
- if ( cmdsize > 1) {
-
- uint8_t cmdBit = (cmd[0] & 1);
- uint8_t address = (cmd[1] << 7) | cmd[0] >> 1;
-
- if (cmdBit == LEGIC_READ)
- snprintf(exp, size, "READ Byte(%d)", address);
- else if (cmdBit == LEGIC_WRITE )
- snprintf(exp, size, "WRITE Byte(%d)", address);
- else
- snprintf(exp, size, "?");
-
- } else {
- if ( cmd[0] == LEGIC_HSK_22 ) snprintf(exp, size, "MIM22");
- if ( cmd[0] == LEGIC_HSK_256 ) snprintf(exp, size, "MIN256/1024");
+void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+ uint8_t bitsend = cmd[0];
+ uint8_t cmdBit = (cmd[1] & 1);
+ switch (bitsend){
+ case 7:
+ snprintf(exp, size, "IV 0x%02X", cmd[1]);
+ break;
+ case 6: {
+ switch ( cmd[1] ) {
+ case LEGIC_MIM_22: snprintf(exp, size, "MIM22"); break;
+ case LEGIC_MIM_256: snprintf(exp, size, "MIM256"); break;
+ case LEGIC_MIM_1024: snprintf(exp, size, "MIM1024"); break;
+ case LEGIC_ACK_22: snprintf(exp, size, "ACK 22"); break;
+ case LEGIC_ACK_256: snprintf(exp, size, "ACK 256/1024"); break;
+ }
+ break;
+ }
+ case 9:
+ case 11: {
+
+ uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;
+
+ if (cmdBit == LEGIC_READ)
+ snprintf(exp, size, "READ Byte(%d)", address);
+
+ if (cmdBit == LEGIC_WRITE )
+ snprintf(exp, size, "WRITE Byte(%d)", address);
+ break;
+ }
+ case 21: {
+ if (cmdBit == LEGIC_WRITE ) {
+ uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0xFF;
+ uint8_t val = (cmd[3] & 1 ) << 7 | cmd[2] >> 1;
+ snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+ }
+ break;
+ }
+ case 23: {
+ if (cmdBit == LEGIC_WRITE ) {
+ uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0x3FF;
+ uint8_t val = (cmd[3] & 0x7 ) << 5 | cmd[2] >> 3;
+ snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+ }
+ break;
+ }
+ case 12:
+ default:
+ break;
}
}
@@ -501,20 +532,6 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
}
}
-uint8_t legic_CRC_check(bool isResponse, uint8_t* data, uint8_t len){
- if (len > 2) return 2;
-
- uint8_t calccrc = CRC8Legic(data, len);
-
- return 0;
- // crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
- // crc_clear(&legic_crc);
- // crc_update(&legic_crc, 1, 1); /* CMD_READ */
- // crc_update(&legic_crc, byte_index, cmd_sz-1);
- // crc_update(&legic_crc, value, 8);
- // return crc_finish(&legic_crc);
-}
-
bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)
{
return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
@@ -631,8 +648,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
default:
break;
}
- } else if ( data_len == 2 && protocol == LEGIC ){
- crcStatus = legic_CRC_check(isResponse, frame, data_len);
}
//0 CRC-command, CRC not ok
//1 CRC-command, CRC ok
@@ -650,7 +665,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
}
uint8_t parityBits = parityBytes[j>>3];
- if (protocol != ISO_14443B && protocol != ISO_7816_4 && (isResponse || protocol == ISO_14443A) && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+ if (protocol != LEGIC && protocol != ISO_14443B && protocol != ISO_7816_4 && (isResponse || protocol == ISO_14443A) && (oddparity != ((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]);
@@ -668,14 +683,20 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
}
}
- if (data_len == 0 )
+ if (data_len == 0 ) {
sprintf(line[0],"<empty trace - possible error>");
+ return tracepos;
+ }
- //--- Draw the CRC column
+ // Draw the CRC column
char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " "));
EndOfTransmissionTimestamp = timestamp + duration;
+ // Always annotate LEGIC read/tag
+ if ( protocol == LEGIC )
+ annotateLegic(explanation,sizeof(explanation),frame,data_len);
+
if (!isResponse) {
switch(protocol) {
case ICLASS: annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
@@ -684,7 +705,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
case ISO_14443B: annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
case TOPAZ: annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
case ISO_7816_4: annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
- case LEGIC: annotateLegic(explanation,sizeof(explanation),frame,data_len); break;
+
default: break;
}
}
@@ -828,8 +849,12 @@ int CmdHFList(const char *Cmd) {
PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
PrintAndLog("");
PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
- PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
- PrintAndLog("iClass - Timings are not as accurate");
+ if ( protocol == ISO_14443A )
+ PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
+ if ( protocol == ICLASS )
+ PrintAndLog("iClass - Timings are not as accurate");
+ if ( protocol == LEGIC )
+ PrintAndLog("LEGIC - Timings are in ticks (1us == 1.5ticks)");
PrintAndLog("");
PrintAndLog(" Start | End | Src | Data (! denotes parity error) | CRC | Annotation |");
PrintAndLog("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");
@@ -849,31 +874,36 @@ int CmdHFSearch(const char *Cmd){
PrintAndLog("");
int ans = CmdHF14AReader("s");
-
if (ans > 0) {
PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
return ans;
}
- ans = CmdHF14BReader("s");
+ ans = HF14BReader(false); //CmdHF14BReader("s");
if (ans) {
PrintAndLog("\nValid ISO14443-B 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;
}
+ ans = HFLegicReader("", false);
+ if ( ans == 0) {
+ PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
+ return 1;
+ }
ans = CmdHFTopazReader("s");
if (ans == 0) {
PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
return 1;
}
+ ans = HFiClassReader("", false, false);
+ if (ans) {
+ PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
+ return ans;
+ }
+
PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
return 0;
}