X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7bc95e2e43c0b00b72fc794b18c26a880ac19d1c..45dda9fcd7d47018c81a86688e2aaa63ba09d018:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index d16d71ff..c9976076 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -43,136 +43,131 @@ int CmdHF14AList(const char *Cmd)
 	if (param == 'f') {
 		ShowWaitCycles = true;
 	}
-		
-	uint8_t got[1920];
-	GetFromBigBuf(got,sizeof(got),0);
-	WaitForResponse(CMD_ACK,NULL);
+
+// for the time being. Need better Bigbuf handling.	
+#define TRACE_SIZE 3000	
+
+	uint8_t trace[TRACE_SIZE];
+	GetFromBigBuf(trace, TRACE_SIZE, 0);
+	WaitForResponse(CMD_ACK, NULL);
 
 	PrintAndLog("Recorded Activity");
 	PrintAndLog("");
 	PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
 	PrintAndLog("All times are in carrier periods (1/13.56Mhz)");
 	PrintAndLog("");
-	PrintAndLog("     Start |       End | Src | Data");
-	PrintAndLog("-----------|-----------|-----|--------");
-
-	int i = 0;
-	uint32_t first_timestamp = 0;
+	PrintAndLog("     Start |       End | Src | Data (! denotes parity error)                                   | CRC ");
+	PrintAndLog("-----------|-----------|-----|-----------------------------------------------------------------------");
+
+	uint16_t tracepos = 0;
+	uint16_t duration;
+	uint16_t data_len;
+	uint16_t parity_len;
+	bool isResponse;
 	uint32_t timestamp;
-	uint32_t EndOfTransmissionTimestamp = 0;
+	uint32_t first_timestamp;
+	uint32_t EndOfTransmissionTimestamp;
 	
 	for (;;) {
-		if(i >= 1900) {
+
+		if(tracepos >= TRACE_SIZE) {
 			break;
 		}
 
-		bool isResponse;
-		timestamp = *((uint32_t *)(got+i));
-		if (timestamp & 0x80000000) {
-		  timestamp &= 0x7fffffff;
+		timestamp = *((uint32_t *)(trace + tracepos));
+		if(tracepos == 0) {
+			first_timestamp = timestamp;
+		}
+
+		// Break and stick with current result if buffer was not completely full
+		if (timestamp == 0x44444444) break; 
+
+		tracepos += 4;
+		duration = *((uint16_t *)(trace + tracepos));
+		tracepos += 2;
+		data_len = *((uint16_t *)(trace + tracepos));
+		tracepos += 2;
+		
+		if (data_len & 0x8000) {
+		  data_len &= 0x7fff;
 		  isResponse = true;
 		} else {
 		  isResponse = false;
 		}
 
-		if(i==0) {
-			first_timestamp = timestamp;
-		}
-		
-		int parityBits = *((uint32_t *)(got+i+4));
-
-		int len = got[i+8];
+		parity_len = (data_len-1)/8 + 1;
 
-		if (len > 100) {
+		if (tracepos + data_len + parity_len >= TRACE_SIZE) {
 			break;
 		}
-		if (i + len >= 1900) {
-			break;
-		}
-
-		uint8_t *frame = (got+i+9);
-
-		// Break and stick with current result if buffer was not completely full
-		if (frame[0] == 0x44 && frame[1] == 0x44 && frame[2] == 0x44 && frame[3] == 0x44) break; 
+		
+		uint8_t *frame = trace + tracepos;
+		tracepos += data_len;
+		uint8_t *parityBytes = trace + tracepos;
+		tracepos += parity_len;
+
+		char line[16][110];
+		for (int j = 0; j < data_len; j++) {
+			int oddparity = 0x01;
+			int k;
+			
+			for (k=0;k<8;k++) {
+				oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
+			}
 
-		char line[1000] = "";
-		int j;
-		if (len) {
-			for (j = 0; j < len; j++) {
-				int oddparity = 0x01;
-				int k;
+			uint8_t parityBits = parityBytes[j>>3];
+			if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+				sprintf(line[j/16]+((j%16)*4), "%02x! ", frame[j]);
+			} else {
+				sprintf(line[j/16]+((j%16)*4), "%02x  ", frame[j]);
+			}
 
-				for (k=0;k<8;k++) {
-					oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-				}
+		}
 
-				//if((parityBits >> (len - j - 1)) & 0x01) {
-				if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
-					sprintf(line+(j*4), "%02x!  ", frame[j]);
-				} else {
-					sprintf(line+(j*4), "%02x   ", frame[j]);
-				}
-			}
-		} else {
-			if (ShowWaitCycles) {
-				uint32_t next_timestamp = (*((uint32_t *)(got+i+9))) & 0x7fffffff;
-				sprintf(line, "fdt (Frame Delay Time): %d", (next_timestamp - timestamp));
+		char crc[5] = ""; 
+		if (data_len > 2) {
+		uint8_t b1, b2;
+			ComputeCrc14443(CRC_14443_A, frame, data_len-2, &b1, &b2);
+			if (b1 != frame[data_len-2] || b2 != frame[data_len-1]) {
+				sprintf(crc, (isResponse & (data_len < 6)) ? "" : "!crc");
+			} else {
+				sprintf(crc, "");
 			}
 		}
 
-		char *crc;
-		crc = "";
-		if (len > 2) {
-			uint8_t b1, b2;
-			for (j = 0; j < (len - 1); j++) {
-				// gives problems... search for the reason..
-				/*if(frame[j] == 0xAA) {
-					switch(frame[j+1]) {
-						case 0x01:
-							crc = "[1] Two drops close after each other";
-							break;
-						case 0x02:
-							crc = "[2] Potential SOC with a drop in second half of bitperiod";
-							break;
-						case 0x03:
-							crc = "[3] Segment Z after segment X is not possible";
-							break;
-						case 0x04:
-							crc = "[4] Parity bit of a fully received byte was wrong";
-							break;
-						default:
-							crc = "[?] Unknown error";
-							break;
-					}
-					break;
-				}*/
+		EndOfTransmissionTimestamp = timestamp + duration;
+		
+		int num_lines = (data_len - 1)/16 + 1;
+		for (int j = 0; j < num_lines; j++) {
+			if (j == 0) {
+				PrintAndLog(" %9d | %9d | %s | %-64s| %s",
+					(timestamp - first_timestamp),
+					(EndOfTransmissionTimestamp - first_timestamp),
+					(isResponse ? "Tag" : "Rdr"),
+					line[j], 
+					(j == num_lines-1)?crc:"");
+			} else {
+				PrintAndLog("           |           |     | %-64s| %s",
+					line[j], 
+					(j == num_lines-1)?crc:"");
 			}
+		}				
 
-			if (strlen(crc)==0) {
-				ComputeCrc14443(CRC_14443_A, frame, len-2, &b1, &b2);
-				if (b1 != frame[len-2] || b2 != frame[len-1]) {
-					crc = (isResponse & (len < 6)) ? "" : " !crc";
-				} else {
-					crc = "";
-				}
+		bool next_isResponse = *((uint16_t *)(trace + tracepos + 6)) & 0x8000;
+		
+		if (ShowWaitCycles && !isResponse && next_isResponse) {
+			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));
 			}
-		} else {
-			crc = ""; // SHORT
 		}
-
-		i += (len + 9);
-
-		EndOfTransmissionTimestamp = (*((uint32_t *)(got+i))) & 0x7fffffff;
-		
-		if (!ShowWaitCycles) i += 9;
-		
-		PrintAndLog(" %9d | %9d | %s | %s %s",
-			(timestamp - first_timestamp),
-			(EndOfTransmissionTimestamp - first_timestamp),
-			(len?(isResponse ? "Tag" : "Rdr"):"   "),
-			line, crc);
-
+			
 	}
+	
 	return 0;
 }
 
@@ -183,27 +178,34 @@ void iso14a_set_timeout(uint32_t timeout) {
 
 int CmdHF14AReader(const char *Cmd)
 {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
 	SendCommand(&c);
 
 	UsbCommand resp;
 	WaitForResponse(CMD_ACK,&resp);
 	
-	iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;
+	iso14a_card_select_t card;
+	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
-	if(resp.arg[0] == 0) {
+	uint64_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;
 	}
 
-	PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
-	PrintAndLog(" UID : %s", sprint_hex(card->uid, card->uidlen));
-	PrintAndLog(" SAK : %02x [%d]", card->sak, resp.arg[0]);
+	PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+	PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+	PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
 
-	switch (card->sak) {
+	switch (card.sak) {
 		case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
 		case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
-
 		case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
 		case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
 		case 0x10: PrintAndLog("TYPE : NXP MIFARE Plus 2k SL2"); break;
@@ -217,67 +219,107 @@ int CmdHF14AReader(const char *Cmd)
 		case 0x98: PrintAndLog("TYPE : Gemplus MPCOS"); break;
 		default: ;
 	}
-	if(resp.arg[0] == 1) {
+
+	
+	// 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
+		c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+		c.arg[1] = 2;
+		c.arg[2] = 0;
+		memcpy(c.d.asBytes, rats, 2);
+		SendCommand(&c);
+		WaitForResponse(CMD_ACK,&resp);
+		
+	    memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+		card.ats_len = resp.arg[0];				// note: ats_len includes CRC Bytes
+	} 
+
+	// disconnect
+	c.arg[0] = 0;
+	c.arg[1] = 0;
+	c.arg[2] = 0;
+	SendCommand(&c);
+
+	
+	if(card.ats_len >= 3) {			// a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
 		bool ta1 = 0, tb1 = 0, tc1 = 0;
 		int pos;
 
-		PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
-		if (card->ats_len > 0) {
-			PrintAndLog("       -  TL : length is %d bytes", card->ats[0]);
+		if (select_status == 2) {
+			PrintAndLog("SAK incorrectly claims that card doesn't support RATS");
+		}
+		PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
+		PrintAndLog("       -  TL : length is %d bytes", card.ats[0]);
+		if (card.ats[0] != card.ats_len - 2) {
+			PrintAndLog("ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
 		}
-		if (card->ats_len > 1) {
-			ta1 = (card->ats[1] & 0x10) == 0x10;
-			tb1 = (card->ats[1] & 0x20) == 0x20;
-			tc1 = (card->ats[1] & 0x40) == 0x40;
+		
+		if (card.ats[0] > 1) {		// there is a format byte (T0)
+			ta1 = (card.ats[1] & 0x10) == 0x10;
+			tb1 = (card.ats[1] & 0x20) == 0x20;
+			tc1 = (card.ats[1] & 0x40) == 0x40;
+			int16_t fsci = card.ats[1] & 0x0f;
 			PrintAndLog("       -  T0 : TA1 is%s present, TB1 is%s present, "
-					"TC1 is%s present, FSCI is %d",
+					"TC1 is%s present, FSCI is %d (FSC = %ld)",
 				(ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),
-				(card->ats[1] & 0x0f));
+				fsci,
+				fsci < 5 ? (fsci - 2) * 8 : 
+					fsci < 8 ? (fsci - 3) * 32 :
+					fsci == 8 ? 256 :
+					-1
+				);
 		}
 		pos = 2;
-		if (ta1 && card->ats_len > pos) {
+		if (ta1) {
 			char dr[16], ds[16];
 			dr[0] = ds[0] = '\0';
-			if (card->ats[pos] & 0x10) strcat(ds, "2, ");
-			if (card->ats[pos] & 0x20) strcat(ds, "4, ");
-			if (card->ats[pos] & 0x40) strcat(ds, "8, ");
-			if (card->ats[pos] & 0x01) strcat(dr, "2, ");
-			if (card->ats[pos] & 0x02) strcat(dr, "4, ");
-			if (card->ats[pos] & 0x04) strcat(dr, "8, ");
+			if (card.ats[pos] & 0x10) strcat(ds, "2, ");
+			if (card.ats[pos] & 0x20) strcat(ds, "4, ");
+			if (card.ats[pos] & 0x40) strcat(ds, "8, ");
+			if (card.ats[pos] & 0x01) strcat(dr, "2, ");
+			if (card.ats[pos] & 0x02) strcat(dr, "4, ");
+			if (card.ats[pos] & 0x04) strcat(dr, "8, ");
 			if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
 			if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
 			PrintAndLog("       - TA1 : different divisors are%s supported, "
 					"DR: [%s], DS: [%s]",
-					(card->ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
+					(card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
 			pos++;
 		}
-		if (tb1 && card->ats_len > pos) {
-			PrintAndLog("       - TB1 : SFGI = %d, FWI = %d",
-					(card->ats[pos] & 0x08),
-					(card->ats[pos] & 0x80) >> 4);
+		if (tb1) {
+			uint32_t sfgi = card.ats[pos] & 0x0F;
+			uint32_t fwi = card.ats[pos] >> 4;
+			PrintAndLog("       - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
+					(sfgi),
+					sfgi ? "" : "(not needed) ",
+					sfgi ? (1 << 12) << sfgi : 0,
+					fwi,
+					(1 << 12) << fwi
+					);
 			pos++;
 		}
-		if (tc1 && card->ats_len > pos) {
+		if (tc1) {
 			PrintAndLog("       - TC1 : NAD is%s supported, CID is%s supported",
-					(card->ats[pos] & 0x01) ? "" : " NOT",
-					(card->ats[pos] & 0x02) ? "" : " NOT");
+					(card.ats[pos] & 0x01) ? "" : " NOT",
+					(card.ats[pos] & 0x02) ? "" : " NOT");
 			pos++;
 		}
-		if (card->ats_len > pos) {
+		if (card.ats[0] > pos) {
 			char *tip = "";
-			if (card->ats_len - pos > 7) {
-				if (memcmp(card->ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
+			if (card.ats[0] - pos >= 7) {
+				if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
 					tip = "-> MIFARE Plus X 2K or 4K";
-				} else if (memcmp(card->ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
+				} else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
 					tip = "-> MIFARE Plus S 2K or 4K";
 				}
 			} 
-			PrintAndLog("       -  HB : %s%s", sprint_hex(card->ats + pos, card->ats_len - pos - 2), tip);
-			if (card->ats[pos] == 0xC1) {
+			PrintAndLog("       -  HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
+			if (card.ats[pos] == 0xC1) {
 				PrintAndLog("               c1 -> Mifare or (multiple) virtual cards of various type");
 				PrintAndLog("                  %02x -> Length is %d bytes",
-						card->ats[pos + 1], card->ats[pos + 1]);
-				switch (card->ats[pos + 2] & 0xf0) {
+						card.ats[pos + 1], card.ats[pos + 1]);
+				switch (card.ats[pos + 2] & 0xf0) {
 					case 0x10:
 						PrintAndLog("                     1x -> MIFARE DESFire");
 						break;
@@ -285,7 +327,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     2x -> MIFARE Plus");
 						break;
 				}
-				switch (card->ats[pos + 2] & 0x0f) {
+				switch (card.ats[pos + 2] & 0x0f) {
 					case 0x00:
 						PrintAndLog("                     x0 -> <1 kByte");
 						break;
@@ -302,7 +344,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     x0 -> 8 kByte");
 						break;
 				}
-				switch (card->ats[pos + 3] & 0xf0) {
+				switch (card.ats[pos + 3] & 0xf0) {
 					case 0x00:
 						PrintAndLog("                        0x -> Engineering sample");
 						break;
@@ -310,7 +352,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                        2x -> Released");
 						break;
 				}
-				switch (card->ats[pos + 3] & 0x0f) {
+				switch (card.ats[pos + 3] & 0x0f) {
 					case 0x00:
 						PrintAndLog("                        x0 -> Generation 1");
 						break;
@@ -321,7 +363,7 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                        x2 -> Generation 3");
 						break;
 				}
-				switch (card->ats[pos + 4] & 0x0f) {
+				switch (card.ats[pos + 4] & 0x0f) {
 					case 0x00:
 						PrintAndLog("                           x0 -> Only VCSL supported");
 						break;
@@ -335,10 +377,10 @@ int CmdHF14AReader(const char *Cmd)
 			}
 		}
 	} else {
-		PrintAndLog("proprietary non iso14443a-4 card found, RATS not supported");
-  }
+		PrintAndLog("proprietary non iso14443-4 card found, RATS not supported");
+	}
 
-	return resp.arg[0];
+	return select_status;
 }
 
 // Collect ISO14443 Type A UIDs
@@ -357,23 +399,20 @@ int CmdHF14ACUIDs(const char *Cmd)
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
 		SendCommand(&c);
     
-    UsbCommand resp;
-    WaitForResponse(CMD_ACK,&resp);
+		UsbCommand resp;
+		WaitForResponse(CMD_ACK,&resp);
 
-		uint8_t *uid  = resp.d.asBytes;
-		iso14a_card_select_t *card = (iso14a_card_select_t *)(uid + 12);
+		iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
 
 		// check if command failed
 		if (resp.arg[0] == 0) {
 			PrintAndLog("Card select failed.");
 		} else {
-			// check if UID is 4 bytes
-			if ((card->atqa[1] & 0xC0) == 0) {
-				PrintAndLog("%02X%02X%02X%02X",
-				            *uid, *(uid + 1), *(uid + 2), *(uid + 3));
-			} else {
-				PrintAndLog("UID longer than 4 bytes");
+			char uid_string[20];
+			for (uint16_t i = 0; i < card->uidlen; i++) {
+				sprintf(&uid_string[2*i], "%02X", card->uid[i]);
 			}
+			PrintAndLog("%s", uid_string);
 		}
 	}
 	PrintAndLog("End: %u", time(NULL));