X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c71c5ee1567c08b9819b3e9733ccb81e875bfca3..ac42d5be8559300b88f0974fc14008010a4368a7:/client/cmdhf.c?ds=sidebyside

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 025a83d4..bc8d2ecc 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -370,14 +370,40 @@ 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){
-	switch(cmd[0]) {
-		case LEGIC_HSK						:snprintf(exp, size, "HANDSHAKE");break;
-		case LEGIC_READ						:snprintf(exp, size, "READ");break;
-		case LEGIC_WRITE					:snprintf(exp, size, "WRITE");break;
-		default								:snprintf(exp,size,"?"); break;
-	}		
+void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){	
+	uint8_t bitsend = cmd[0];	
+	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: {
+			uint8_t cmdBit = (cmd[1] & 1);
+			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 12:
+		default:
+			break;
+	}
 }
+
 /**
  * @brief iso14443A_CRC_check Checks CRC in command or response
  * @param isResponse
@@ -489,17 +515,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;
-	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);
@@ -616,8 +631,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
@@ -635,9 +648,8 @@ 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]);
 		}
@@ -654,17 +666,21 @@ 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;
 
-	if(!isResponse)
-	{
+	// 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;
 			case ISO_14443A:	annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
@@ -672,7 +688,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;
 		}
 	}
@@ -680,7 +696,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 	int num_lines = MIN((data_len - 1)/16 + 1, 16);
 	for (int j = 0; j < num_lines ; j++) {
 		if (j == 0) {
-			PrintAndLog(" %10d | %10d | %s |%-64s | %s| %s",
+			PrintAndLog(" %10u | %10u | %s |%-64s | %s| %s",
 				(timestamp - first_timestamp),
 				(EndOfTransmissionTimestamp - first_timestamp),
 				(isResponse ? "Tag" : "Rdr"),
@@ -699,7 +715,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 	
 	if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
 		uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
-			PrintAndLog(" %10d | %10d | %s |fdt (Frame Delay Time): %d",
+			PrintAndLog(" %10u | %10u | %s |fdt (Frame Delay Time): %d",
 				(EndOfTransmissionTimestamp - first_timestamp),
 				(next_timestamp - first_timestamp),
 				"   ",
@@ -816,8 +832,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("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");
@@ -862,6 +882,12 @@ int CmdHFSearch(const char *Cmd){
 		PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
 		return 1;
 	}
+	ans = HFLegicReader("", false);
+	if ( ans == 0) {
+		PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
+		return 1;
+	}
+	
 	PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
 	return 0;
 }