X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/117d9ec25c7cbc88555a6a990293ca95a544b915..0b0b182fe26cf7b94eb8480ef1d4a674981491b8:/armsrc/mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 69138811..2dcd6d1a 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -9,91 +9,90 @@
 //-----------------------------------------------------------------------------
 
 #include "mifaresniff.h"
-#include "apps.h"
 
 static int sniffState = SNF_INIT;
-static uint8_t sniffUIDType;
-static uint8_t sniffUID[8] = {0x00};
-static uint8_t sniffATQA[2] = {0x00};
-static uint8_t sniffSAK;
-static uint8_t sniffBuf[16] = {0x00};
+static uint8_t sniffUIDType = 0;
+static uint8_t sniffUID[10] = {0,0,0,0,0,0,0,0,0,0};
+static uint8_t sniffATQA[2] = {0,0};
+static uint8_t sniffSAK = 0;
+static uint8_t sniffBuf[17];
 static uint32_t timerData = 0;
 
-
-bool MfSniffInit(void){
-	memset(sniffUID, 0x00, 8);
-	memset(sniffATQA, 0x00, 2);
+void MfSniffInit(void){
+	memset(sniffUID, 0x00, sizeof(sniffUID));
+	memset(sniffATQA, 0x00, sizeof(sniffATQA));
+	memset(sniffBuf, 0x00, sizeof(sniffBuf));
 	sniffSAK = 0;
 	sniffUIDType = SNF_UID_4;
-
-	return FALSE;
 }
 
-bool MfSniffEnd(void){
+void MfSniffEnd(void){
 	LED_B_ON();
 	cmd_send(CMD_ACK,0,0,0,0,0);
 	LED_B_OFF();
-
-	return FALSE;
 }
 
 bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
 
-	if (reader && (len == 1) && (bitCnt == 7)) { 		// reset on 7-Bit commands from reader
+	// reset on 7-Bit commands from reader
+	if (reader && (len == 1) && (bitCnt == 7)) { 		
 		sniffState = SNF_INIT;
 	}
 
 	switch (sniffState) {
 		case SNF_INIT:{
-			if ((len == 1) && (reader) && (bitCnt == 7) ) {  // REQA or WUPA from reader
-				sniffUIDType = SNF_UID_4;
-				memset(sniffUID, 0x00, 8);
-				memset(sniffATQA, 0x00, 2);
-				sniffSAK = 0;
+			// REQA or WUPA from reader
+			if ((len == 1) && (reader) && (bitCnt == 7) ) {
+				MfSniffInit();
 				sniffState = SNF_WUPREQ;
 			}
 			break;
 		}
 		case SNF_WUPREQ:{
-			if ((!reader) && (len == 2)) { 		// ATQA from tag
-				memcpy(sniffATQA, data, 2);
+			// ATQA from tag
+			if ((!reader) && (len == 2)) {
+				sniffATQA[0] = data[0];
+				sniffATQA[1] = data[1];
 				sniffState = SNF_ATQA;
 			}
 			break;
 		}
 		case SNF_ATQA:{
-			if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader
+			// Select ALL from reader
+			if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20))
 				sniffState = SNF_ANTICOL1;
-			}
 			break;
 		}
 		case SNF_ANTICOL1:{
-			if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {  // UID from tag (CL1) 
-				memcpy(sniffUID + 3, data, 4);
+			// UID from tag (CL1) 
+			if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {
+				memcpy(sniffUID, data, 4);
 				sniffState = SNF_UID1;
 			}
 			break;
 		}
 		case SNF_UID1:{
-			if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {   // Select 4 Byte UID from reader
+			// Select 4 Byte UID from reader
+			if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9)))
 				sniffState = SNF_SAK;
-			}
 			break;
 		}
 		case SNF_SAK:{
 			if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) { // SAK from card?
 				sniffSAK = data[0];
-				if (sniffUID[3] == 0x88) {			// CL2 UID part to be expected
-					sniffState = SNF_ANTICOL2;
-				} else {							// select completed
+				if (sniffUID[0] == 0x88)			// CL2/3 UID part to be expected					
+					sniffState = (sniffState == SNF_ANTICOL2 ) ? SNF_ANTICOL3 : SNF_ANTICOL2;
+				else								// select completed
 					sniffState = SNF_CARD_IDLE;
-				}
 			}
 			break;
 		}
 		case SNF_ANTICOL2:{
-			if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // CL2 UID 
-				memcpy(sniffUID, sniffUID+4, 3);
+			 // CL2 UID 
+			if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {
+				sniffUID[0] = sniffUID[1];
+				sniffUID[1] = sniffUID[2];
+				sniffUID[2] = sniffUID[3];
 				memcpy(sniffUID+3, data, 4);
 				sniffUIDType = SNF_UID_7;
 				sniffState = SNF_UID2;
@@ -101,20 +100,39 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 			break;
 		}
 		case SNF_UID2:{
-			if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {	// Select 2nd part of 7 Byte UID
+			// Select 2nd part of 7 Byte UID
+			if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9)))
 				sniffState = SNF_SAK;
+			break;
+		}
+		case SNF_ANTICOL3:{
+			// CL3 UID 
+			if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { 
+				// 3+3+4 = 10.
+				sniffUID[3] = sniffUID[4];
+				sniffUID[4] = sniffUID[5];
+				sniffUID[5] = sniffUID[6];
+				memcpy(sniffUID+6, data, 4);
+				sniffUIDType = SNF_UID_10;
+				sniffState = SNF_UID3;
 			}
 			break;
 		}
+		case SNF_UID3:{
+			// Select 3nd part of 10 Byte UID
+			if ((reader) && (len == 9) && (data[0] == 0x97) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9)))
+				sniffState = SNF_SAK;
+			break;
+		}
 		case SNF_CARD_IDLE:{	// trace the card select sequence
 			sniffBuf[0] = 0xFF;
 			sniffBuf[1] = 0xFF;
-			memcpy(sniffBuf + 2, sniffUID, 7);
-			memcpy(sniffBuf + 9, sniffATQA, 2);
-			sniffBuf[11] = sniffSAK;
-			sniffBuf[12] = 0xFF;
-			sniffBuf[13] = 0xFF;
-			LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE);
+			memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));
+			memcpy(sniffBuf + 12, sniffATQA, sizeof(sniffATQA));
+			sniffBuf[14] = sniffSAK;
+			sniffBuf[15] = 0xFF;
+			sniffBuf[16] = 0xFF;
+			LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, TRUE);
 		}	// intentionally no break;
 		case SNF_CARD_CMD:{		
 			LogTrace(data, len, 0, 0, NULL, TRUE);
@@ -128,18 +146,15 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 			timerData = GetTickCount();
 			break;
 		}
-	
 		default:
 			sniffState = SNF_INIT;
 		break;
 	}
-
-
 	return FALSE;
 }
 
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
-	if (traceLen && (GetTickCount() > timerData + maxTimeoutMs)) {
+	if (BigBuf_get_traceLen() && (GetTickCount() > timerData + maxTimeoutMs)) {
 		return intMfSniffSend();
 	}
 	return FALSE;
@@ -149,26 +164,24 @@ bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
 bool intMfSniffSend() {
 
 	int pckSize = 0;
-	int pckLen = traceLen;
+	int pckLen = BigBuf_get_traceLen();
 	int pckNum = 0;
-	uint8_t *trace = BigBuf_get_addr();
+	uint8_t *data = BigBuf_get_addr();
 	
 	FpgaDisableSscDma();
 	while (pckLen > 0) {
 		pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);
 		LED_B_ON();
-		cmd_send(CMD_ACK, 1, pckSize, pckNum, trace + traceLen - pckLen, pckSize);
+		cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, data + BigBuf_get_traceLen() - pckLen, pckSize);
 		LED_B_OFF();
-
 		pckLen -= pckSize;
 		pckNum++;
 	}
 
 	LED_B_ON();
-	cmd_send(CMD_ACK,2,0,0,0,0);
+	cmd_send(CMD_ACK,2,0,0,0,0);  // 2 == data transfer is finished.
 	LED_B_OFF();
 
-	iso14a_clear_trace();
-	
+	clear_trace();
 	return TRUE;
 }