X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c8b6da2295a35cda0232f147993a0ed6ff68b207..7afa751a9673c0427d75116eac14dce2d19adedb:/armsrc/mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 9b6f5f04..5391e5f9 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -1,173 +1,166 @@
-//-----------------------------------------------------------------------------
-// Merlok - 2012
-//
-// This code is licensed to you under the terms of the GNU GPL, version 2 or,
-// at your option, any later version. See the LICENSE.txt file for the text of
-// the license.
-//-----------------------------------------------------------------------------
-// Routines to support mifare classic sniffer.
-//-----------------------------------------------------------------------------
-
-#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 uint32_t timerData = 0;
-
-
-bool MfSniffInit(void){
-	memset(sniffUID, 0x00, 8);
-	memset(sniffATQA, 0x00, 2);
-	sniffSAK = 0;
-	sniffUIDType = SNF_UID_4;
-
-	return FALSE;
-}
-
-bool 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
-		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;
-				sniffState = SNF_WUPREQ;
-			}
-			break;
-		}
-		case SNF_WUPREQ:{
-			if ((!reader) && (len == 2)) { 		// ATQA from tag
-				memcpy(sniffATQA, data, 2);
-				sniffState = SNF_ATQA;
-			}
-			break;
-		}
-		case SNF_ATQA:{
-			if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader
-				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);
-				sniffState = SNF_UID1;
-			}
-			break;
-		}
+//-----------------------------------------------------------------------------
+// Merlok - 2012
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support mifare classic sniffer.
+//-----------------------------------------------------------------------------
+
+#include "mifaresniff.h"
+#include "apps.h"
+#include "proxmark3.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1/crapto1.h"
+#include "mifareutil.h"
+#include "common.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 uint32_t timerData = 0;
+
+
+bool MfSniffInit(void){
+	memset(sniffUID, 0x00, 8);
+	memset(sniffATQA, 0x00, 2);
+	sniffSAK = 0;
+	sniffUIDType = SNF_UID_4;
+
+	return false;
+}
+
+bool 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
+		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;
+				sniffState = SNF_ATQA;
+				if (data[0] == 0x40) 
+					sniffState = SNF_MAGIC_WUPC2;
+			}
+			break;
+		}
+		case SNF_MAGIC_WUPC2:
+			if ((len == 1) && (reader) && (data[0] == 0x43) ) {  
+				sniffState = SNF_CARD_IDLE;
+			}
+			break;
+		case SNF_ATQA:{
+			if ((!reader) && (len == 2)) { 		// ATQA from tag
+				memcpy(sniffATQA, data, 2);
+				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
+				memcpy(sniffUID + 3, &data[2], 4);
 				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
-					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);
-				memcpy(sniffUID+3, data, 4);
-				sniffUIDType = SNF_UID_7;
-				sniffState = SNF_UID2;
-			}
-			break;
+			break;
 		}
+		case SNF_SAK:{
+			if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) { // SAK from card?
+				sniffSAK = data[0];
+				if ((sniffUID[3] == 0x88) && (sniffUIDType == SNF_UID_4)) {			// CL2 UID part to be expected
+					sniffUIDType = SNF_UID_7;
+					memcpy(sniffUID, sniffUID + 4, 3);
+					sniffState = SNF_UID2;
+				} else {															// select completed
+					sniffState = SNF_CARD_IDLE;
+				}
+			}
+			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
+			if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {
+				memcpy(sniffUID + 3, &data[2], 4);
 				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);
-		}	// intentionally no break;
-		case SNF_CARD_CMD:{		
-			LogTrace(data, len, 0, 0, NULL, TRUE);
-			sniffState = SNF_CARD_RESP;
-			timerData = GetTickCount();
-			break;
-		}
-		case SNF_CARD_RESP:{
-			LogTrace(data, len, 0, 0, NULL, FALSE);
-			sniffState = SNF_CARD_CMD;
-			timerData = GetTickCount();
-			break;
-		}
-	
-		default:
-			sniffState = SNF_INIT;
-		break;
-	}
-
-
-	return FALSE;
-}
-
-bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
-	if (traceLen && (GetTickCount() > timerData + maxTimeoutMs)) {
-		return intMfSniffSend();
-	}
-	return FALSE;
-}
-
-// internal sending function. not a RAMFUNC.
-bool intMfSniffSend() {
-
-	int pckSize = 0;
-	int pckLen = traceLen;
-	int pckNum = 0;
-
-	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);
-		LED_B_OFF();
-
-		pckLen -= pckSize;
-		pckNum++;
-	}
-
-	LED_B_ON();
-	cmd_send(CMD_ACK,2,0,0,0,0);
-	LED_B_OFF();
-
-	iso14a_clear_trace();
-	
-	return TRUE;
-}
+		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);
+			sniffState = SNF_CARD_CMD;
+		}	// intentionally no break;
+		case SNF_CARD_CMD:{	
+			LogTrace(data, len, 0, 0, parity, reader);
+			timerData = GetTickCount();
+			break;
+		}
+	
+		default:
+			sniffState = SNF_INIT;
+		break;
+	}
+
+
+	return false;
+}
+
+bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
+	if (BigBuf_get_traceLen() && (GetTickCount() > timerData + maxTimeoutMs)) {
+		return intMfSniffSend();
+	}
+	return false;
+}
+
+// internal sending function. not a RAMFUNC.
+bool intMfSniffSend() {
+
+	int pckSize = 0;
+	int pckLen = BigBuf_get_traceLen();
+	int pckNum = 0;
+	uint8_t *trace = BigBuf_get_addr();
+	
+	FpgaDisableSscDma();
+	while (pckLen > 0) {
+		pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);
+		LED_B_ON();
+		cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, trace + BigBuf_get_traceLen() - pckLen, pckSize);
+		LED_B_OFF();
+
+		pckLen -= pckSize;
+		pckNum++;
+	}
+
+	LED_B_ON();
+	cmd_send(CMD_ACK,2,0,0,0,0);
+	LED_B_OFF();
+
+	clear_trace();
+	
+	return true;
+}