X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cee5a30d53c7aff4c4830eae53eaf58414ecf806..f83cc12613d18f6a5a3a5e6c01f7b83cae2ee92f:/armsrc/iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index d1bb8df3..5a4c15d0 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -2,6 +2,7 @@
 // Gerhard de Koning Gans - May 2008
 // Hagen Fritsch - June 2010
 // Gerhard de Koning Gans - May 2011
+// Gerhard de Koning Gans - June 2012 - Added iClass card and reader emulation
 //
 // 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
@@ -15,11 +16,6 @@
 // Please feel free to contribute and extend iClass support!!
 //-----------------------------------------------------------------------------
 //
-// TODO:
-// =====
-// - iClass emulation
-// - reader emulation
-//
 // FIX:
 // ====
 // We still have sometimes a demodulation error when snooping iClass communication.
@@ -44,12 +40,13 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
+#include "common.h"
+// Needed for CRC in emulation mode;
+// same construction as in ISO 14443;
+// different initial value (CRC_ICLASS)
+#include "iso14443crc.h"
 
-#include "iclass.h"
-
-static uint8_t *trace = (uint8_t *) BigBuf;
-static int traceLen = 0;
-static int rsamples = 0;
+static int timeout = 4096;
 
 // CARD TO READER
 // Sequence D: 11110000 modulation with subcarrier during first half
@@ -59,42 +56,11 @@ static int rsamples = 0;
 // Sequence X: 00001100 drop after half a period
 // Sequence Y: 00000000 no drop
 // Sequence Z: 11000000 drop at start
-#define	SEC_D 0xf0
-#define	SEC_E 0x0f
-#define	SEC_F 0x00
 #define	SEC_X 0x0c
 #define	SEC_Y 0x00
 #define	SEC_Z 0xc0
 
-static const uint8_t OddByteParity[256] = {
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
-};
-
-//static const uint8_t MajorityNibble[16] = { 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1 };
-//static const uint8_t MajorityNibble[16] =   { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
-
-// BIG CHANGE - UNDERSTAND THIS BEFORE WE COMMIT
-#define RECV_CMD_OFFSET   3032
-#define RECV_RES_OFFSET   3096
-#define DMA_BUFFER_OFFSET 3160
-#define DMA_BUFFER_SIZE   4096
-#define TRACE_LENGTH      3000
-
+static int SendIClassAnswer(uint8_t *resp, int respLen, int delay);
 
 //-----------------------------------------------------------------------------
 // The software UART that receives commands from the reader, and its state
@@ -114,8 +80,8 @@ static struct {
     int     nOutOfCnt;
     int     OutOfCnt;
     int     syncBit;
-	int     parityBits;
-	int     samples;
+    int     parityBits;
+    int     samples;
     int     highCnt;
     int     swapper;
     int     counter;
@@ -124,9 +90,9 @@ static struct {
     uint8_t   *output;
 } Uart;
 
-static RAMFUNC int MillerDecoding(int bit)
+static RAMFUNC int OutOfNDecoding(int bit)
 {
-	int error = 0;
+	//int error = 0;
 	int bitright;
 
 	if(!Uart.bitBuffer) {
@@ -194,7 +160,7 @@ static RAMFUNC int MillerDecoding(int bit)
 					// When not part of SOF or EOF, it is an error
 					Uart.state = STATE_UNSYNCD;
 					Uart.highCnt = 0;
-					error = 4;
+					//error = 4;
 				}
 			}
 		}
@@ -206,10 +172,10 @@ static RAMFUNC int MillerDecoding(int bit)
 			if(!bit) {
 				if(Uart.dropPosition) {
 					if(Uart.state == STATE_START_OF_COMMUNICATION) {
-						error = 1;
+						//error = 1;
 					}
 					else {
-						error = 7;
+						//error = 7;
 					}
 					// It is an error if we already have seen a drop in current frame
 					Uart.state = STATE_UNSYNCD;
@@ -249,7 +215,7 @@ static RAMFUNC int MillerDecoding(int bit)
 					if(!Uart.dropPosition) {
 						Uart.state = STATE_UNSYNCD;
 						Uart.highCnt = 0;
-						error = 9;
+						//error = 9;
 					}
 					else {
 						Uart.shiftReg >>= 2;
@@ -283,7 +249,7 @@ static RAMFUNC int MillerDecoding(int bit)
 				if(!Uart.dropPosition) {
 					Uart.state = STATE_UNSYNCD;
 					Uart.highCnt = 0;
-					error = 3;
+					//error = 3;
 				}
 				else {
 					Uart.dropPosition--;
@@ -359,7 +325,7 @@ static RAMFUNC int MillerDecoding(int bit)
 				Uart.OutOfCnt = 4; // Start at 1/4, could switch to 1/256
 				Uart.dropPosition = 0;
 				Uart.shiftReg = 0;
-				error = 0;
+				//error = 0;
 			}
 			else {
 				Uart.highCnt = 0;
@@ -376,7 +342,7 @@ static RAMFUNC int MillerDecoding(int bit)
 }
 
 //=============================================================================
-// ISO 14443 Type A - Manchester
+// Manchester
 //=============================================================================
 
 static struct {
@@ -434,28 +400,6 @@ static RAMFUNC int ManchesterDecoding(int v)
 		Demod.syncBit = 0;
 		//Demod.samples = 0;
 		Demod.posCount = 1;		// This is the first half bit period, so after syncing handle the second part
-	/*	if(bit & 0x08) { Demod.syncBit = 0x08; }
-		if(!Demod.syncBit)	{
-			if(bit & 0x04) { Demod.syncBit = 0x04; }
-		}
-		else if(bit & 0x04) { Demod.syncBit = 0x04; bit <<= 4; }
-		if(!Demod.syncBit)	{
-			if(bit & 0x02) { Demod.syncBit = 0x02; }
-		}
-		else if(bit & 0x02) { Demod.syncBit = 0x02; bit <<= 4; }
-		if(!Demod.syncBit)	{
-			if(bit & 0x01) { Demod.syncBit = 0x01; }
-
-			if(Demod.syncBit && (Demod.buffer & 0x08)) {
-				Demod.syncBit = 0x08;
-
-				// The first half bitperiod is expected in next sample
-				Demod.posCount = 0;
-				Demod.output[Demod.len] = 0xfb;
-			}
-		}
-		else if(bit & 0x01) { Demod.syncBit = 0x01; }
-	*/
 
 		if(bit & 0x08) {
 			Demod.syncBit = 0x08;
@@ -711,7 +655,7 @@ static RAMFUNC int ManchesterDecoding(int v)
 }
 
 //=============================================================================
-// Finally, a `sniffer' for ISO 14443 Type A
+// Finally, a `sniffer' for iClass communication
 // Both sides of communication!
 //=============================================================================
 
@@ -722,29 +666,24 @@ static RAMFUNC int ManchesterDecoding(int v)
 //-----------------------------------------------------------------------------
 void RAMFUNC SnoopIClass(void)
 {
-//	#define RECV_CMD_OFFSET 	2032	// original (working as of 21/2/09) values
-//	#define RECV_RES_OFFSET		2096	// original (working as of 21/2/09) values
-//	#define DMA_BUFFER_OFFSET	2160	// original (working as of 21/2/09) values
-//	#define DMA_BUFFER_SIZE 	4096	// original (working as of 21/2/09) values
-//	#define TRACE_LENGTH	 	2000	// original (working as of 21/2/09) values
+
 
     // We won't start recording the frames that we acquire until we trigger;
     // a good trigger condition to get started is probably when we see a
     // response from the tag.
-    int triggered = FALSE; // FALSE to wait first for card
+    //int triggered = FALSE; // FALSE to wait first for card
 
     // The command (reader -> tag) that we're receiving.
 	// The length of a received command will in most cases be no more than 18 bytes.
 	// So 32 should be enough!
-    uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
+	uint8_t *readerToTagCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
     // The response (tag -> reader) that we're receiving.
-    uint8_t *receivedResponse = (((uint8_t *)BigBuf) + RECV_RES_OFFSET);
+	uint8_t *tagToReaderResponse = (((uint8_t *)BigBuf) + RECV_RES_OFFSET);
 
-    // As we receive stuff, we copy it from receivedCmd or receivedResponse
-    // into trace, along with its length and other annotations.
-    //uint8_t *trace = (uint8_t *)BigBuf;
-    
-    traceLen = 0; // uncommented to fix ISSUE 15 - gerhard - jan2011
+    // reset traceLen to 0
+    iso14a_set_tracing(TRUE);
+    iso14a_clear_trace();
+    iso14a_set_trigger(FALSE);
 
     // The DMA buffer, used to stream samples from the FPGA
     int8_t *dmaBuf = ((int8_t *)BigBuf) + DMA_BUFFER_OFFSET;
@@ -761,7 +700,7 @@ void RAMFUNC SnoopIClass(void)
     memset(trace, 0x44, RECV_CMD_OFFSET);
 
     // Set up the demodulator for tag -> reader responses.
-    Demod.output = receivedResponse;
+	Demod.output = tagToReaderResponse;
     Demod.len = 0;
     Demod.state = DEMOD_UNSYNCD;
 
@@ -773,7 +712,7 @@ void RAMFUNC SnoopIClass(void)
 
     // And the reader -> tag commands
     memset(&Uart, 0, sizeof(Uart));
-    Uart.output = receivedCmd;
+	Uart.output = readerToTagCmd;
     Uart.byteCntMax = 32; // was 100 (greg)////////////////////////////////////////////////////////////////////////
     Uart.state = STATE_UNSYNCD;
 
@@ -816,20 +755,13 @@ void RAMFUNC SnoopIClass(void)
 
         //samples += 4;
 	samples += 1;
-	//div2++;	
 
-	//if(div2 > 3) {
-		//div2 = 0;
-	//decbyte ^= ((smpl & 0x01) << (3 - div));
-	//decbyte ^= (((smpl & 0x01) | ((smpl & 0x02) >> 1)) << (3 - div)); // better already...
-	//decbyte ^= (((smpl & 0x01) | ((smpl & 0x02) >> 1) | ((smpl & 0x04) >> 2)) << (3 - div)); // even better...
 	if(smpl & 0xF) {
 		decbyte ^= (1 << (3 - div));
 	}
-	//decbyte ^= (MajorityNibble[(smpl & 0x0F)] << (3 - div));
 	
 	// FOR READER SIDE COMMUMICATION...
-	//decbyte ^=  ((smpl & 0x10) << (3 - div));
+
 	decbyter <<= 2;
 	decbyter ^= (smpl & 0x30);
 
@@ -837,24 +769,14 @@ void RAMFUNC SnoopIClass(void)
 	
 	if((div + 1) % 2 == 0) {
 		smpl = decbyter;	
-		if(MillerDecoding((smpl & 0xF0) >> 4)) {
+		if(OutOfNDecoding((smpl & 0xF0) >> 4)) {
 		    rsamples = samples - Uart.samples;
 		    LED_C_ON();
-		    //if(triggered) {
-			trace[traceLen++] = ((rsamples >>  0) & 0xff);
-			trace[traceLen++] = ((rsamples >>  8) & 0xff);
-			trace[traceLen++] = ((rsamples >> 16) & 0xff);
-			trace[traceLen++] = ((rsamples >> 24) & 0xff);
-			trace[traceLen++] = ((Uart.parityBits >>  0) & 0xff);
-			trace[traceLen++] = ((Uart.parityBits >>  8) & 0xff);
-			trace[traceLen++] = ((Uart.parityBits >> 16) & 0xff);
-			trace[traceLen++] = ((Uart.parityBits >> 24) & 0xff);
-			trace[traceLen++] = Uart.byteCnt;
-			memcpy(trace+traceLen, receivedCmd, Uart.byteCnt);
-			traceLen += Uart.byteCnt;
-			if(traceLen > TRACE_LENGTH) break;
-		    //}
-		    /* And ready to receive another command. */
+
+			if(!LogTrace(readerToTagCmd,Uart.byteCnt, rsamples, Uart.parityBits,TRUE)) break;
+			//if(!LogTrace(NULL, 0, Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER, 0, TRUE)) break;
+
+			/* And ready to receive another command. */
 		    Uart.state = STATE_UNSYNCD;
 		    /* And also reset the demod code, which might have been */
 		    /* false-triggered by the commands from the reader. */
@@ -871,26 +793,13 @@ void RAMFUNC SnoopIClass(void)
 		    rsamples = samples - Demod.samples;
 		    LED_B_ON();
 
-		    // timestamp, as a count of samples
-		    trace[traceLen++] = ((rsamples >>  0) & 0xff);
-		    trace[traceLen++] = ((rsamples >>  8) & 0xff);
-		    trace[traceLen++] = ((rsamples >> 16) & 0xff);
-		    trace[traceLen++] = 0x80 | ((rsamples >> 24) & 0xff);
-		    trace[traceLen++] = ((Demod.parityBits >>  0) & 0xff);
-		    trace[traceLen++] = ((Demod.parityBits >>  8) & 0xff);
-		    trace[traceLen++] = ((Demod.parityBits >> 16) & 0xff);
-		    trace[traceLen++] = ((Demod.parityBits >> 24) & 0xff);
-		    // length
-		    trace[traceLen++] = Demod.len;
-		    memcpy(trace+traceLen, receivedResponse, Demod.len);
-		    traceLen += Demod.len;
-		    if(traceLen > TRACE_LENGTH) break;
-
-		    triggered = TRUE;
+			if(!LogTrace(tagToReaderResponse,Demod.len, rsamples, Demod.parityBits,FALSE)) break;
+			//if (!LogTrace(NULL, 0, Demod.endTime*16 - DELAY_TAG_AIR2ARM_AS_SNIFFER, 0, FALSE)) break;
+
 
 		    // And ready to receive another response.
 		    memset(&Demod, 0, sizeof(Demod));
-		    Demod.output = receivedResponse;
+			Demod.output = tagToReaderResponse;
 		    Demod.state = DEMOD_UNSYNCD;
 		    LED_C_OFF();
 		}
@@ -917,7 +826,683 @@ done:
     Dbprintf("%x %x %x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);
     LED_A_OFF();
     LED_B_OFF();
-	LED_C_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
+}
+
+void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
+	int i; 
+	for(i = 0; i < 8; i++) {
+		rotatedCSN[i] = (originalCSN[i] >> 3) | (originalCSN[(i+1)%8] << 5);
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Wait for commands from reader
+// Stop when button is pressed
+// Or return TRUE when command is captured
+//-----------------------------------------------------------------------------
+static int GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen)
+{
+    // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen
+    // only, since we are receiving, not transmitting).
+    // Signal field is off with the appropriate LED
+    LED_D_OFF();
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN);
+
+    // Now run a `software UART' on the stream of incoming samples.
+    Uart.output = received;
+    Uart.byteCntMax = maxLen;
+    Uart.state = STATE_UNSYNCD;
+
+    for(;;) {
+        WDT_HIT();
+
+        if(BUTTON_PRESS()) return FALSE;
+
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+            AT91C_BASE_SSC->SSC_THR = 0x00;
+        }
+        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+            uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+			/*if(OutOfNDecoding((b & 0xf0) >> 4)) {
+				*len = Uart.byteCnt;
+				return TRUE;
+			}*/
+			if(OutOfNDecoding(b & 0x0f)) {
+				*len = Uart.byteCnt;
+				return TRUE;
+			}
+        }
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+// Prepare tag messages
+//-----------------------------------------------------------------------------
+static void CodeIClassTagAnswer(const uint8_t *cmd, int len)
+{
+	int i;
+
+	ToSendReset();
+
+	// Send SOF
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0xff;
+
+	for(i = 0; i < len; i++) {
+		int j;
+		uint8_t b = cmd[i];
+
+		// Data bits
+		for(j = 0; j < 8; j++) {
+			if(b & 1) {
+				ToSend[++ToSendMax] = 0x00;
+				ToSend[++ToSendMax] = 0xff;
+			} else {
+				ToSend[++ToSendMax] = 0xff;
+				ToSend[++ToSendMax] = 0x00;
+			}
+			b >>= 1;
+		}
+	}
+
+	// Send EOF
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0x00;
+
+	// Convert from last byte pos to length
+	ToSendMax++;
+}
+
+// Only SOF 
+static void CodeIClassTagSOF()
+{
+	ToSendReset();
+
+	// Send SOF
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0xff;
+	ToSend[++ToSendMax] = 0x00;
+	ToSend[++ToSendMax] = 0xff;
+	
+	// Convert from last byte pos to length
+	ToSendMax++;
+}
+
+/**
+ * @brief SimulateIClass simulates an iClass card.
+ * @param arg0 type of simulation
+ *			- 0 uses the first 8 bytes in usb data as CSN
+ *			- 2 "dismantling iclass"-attack. This mode iterates through all CSN's specified
+ *			in the usb data. This mode collects MAC from the reader, in order to do an offline
+ *			attack on the keys. For more info, see "dismantling iclass" and proxclone.com.
+ *			- Other : Uses the default CSN (031fec8af7ff12e0)
+ * @param arg1 - number of CSN's contained in datain (applicable for mode 2 only)
+ * @param arg2
+ * @param datain
+ */
+void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
+{
+	uint32_t simType = arg0;
+	uint32_t numberOfCSNS = arg1;
+
+	// Enable and clear the trace
+	iso14a_set_tracing(TRUE);
+	iso14a_clear_trace();
+
+	uint8_t csn_crc[] = { 0x03, 0x1f, 0xec, 0x8a, 0xf7, 0xff, 0x12, 0xe0, 0x00, 0x00 };
+
+	if(simType == 0) {
+		// Use the CSN from commandline
+		memcpy(csn_crc, datain, 8);
+		doIClassSimulation(csn_crc,0);
+	}else if(simType == 1)
+	{
+		doIClassSimulation(csn_crc,0);
+	}
+	else if(simType == 2)
+	{
+		Dbprintf("Going into attack mode");
+		// In this mode, a number of csns are within datain. We'll simulate each one, one at a time
+		// in order to collect MAC's from the reader. This can later be used in an offlne-attack
+		// in order to obtain the keys, as in the "dismantling iclass"-paper.
+		for(int i = 0 ; i < numberOfCSNS && i*8+8 < USB_CMD_DATA_SIZE; i++)
+		{
+			// The usb data is 512 bytes, fitting 65 8-byte CSNs in there.
+
+			memcpy(csn_crc, datain+(i*8), 8);
+			if(doIClassSimulation(csn_crc,1))
+			{
+				return; // Button pressed
+			}
+		}
+	}else{
+		// We may want a mode here where we hardcode the csns to use (from proxclone).
+		// That will speed things up a little, but not required just yet.
+		Dbprintf("The mode is not implemented, reserved for future use");
+	}
+
+}
+/**
+ * @brief Does the actual simulation
+ * @param csn - csn to use
+ * @param breakAfterMacReceived if true, returns after reader MAC has been received.
+ */
+int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived)
+{
+	// CSN followed by two CRC bytes
+	uint8_t response2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	uint8_t response3[] = { 0,0,0,0,0,0,0,0,0,0};
+	memcpy(response3,csn,sizeof(response3));
+	Dbprintf("Simulating CSN %02x%02x%02x%02x%02x%02x%02x%02x",csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]);
+	// e-Purse
+	uint8_t response4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+	// Construct anticollision-CSN
+	rotateCSN(response3,response2);
+
+	// Compute CRC on both CSNs
+	ComputeCrc14443(CRC_ICLASS, response2, 8, &response2[8], &response2[9]);
+	ComputeCrc14443(CRC_ICLASS, response3, 8, &response3[8], &response3[9]);
+
+	int exitLoop = 0;
+	// Reader 0a
+	// Tag    0f
+	// Reader 0c
+	// Tag    anticoll. CSN
+	// Reader 81 anticoll. CSN
+	// Tag    CSN
+
+	uint8_t *resp;
+	int respLen;
+	uint8_t* respdata = NULL;
+	int respsize = 0;
+	uint8_t sof = 0x0f;
+
+	// Respond SOF -- takes 8 bytes
+	uint8_t *resp1 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET);
+	int resp1Len;
+
+	// Anticollision CSN (rotated CSN)
+	// 176: Takes 16 bytes for SOF/EOF and 10 * 16 = 160 bytes (2 bytes/bit)
+	uint8_t *resp2 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 10);
+	int resp2Len;
+
+	// CSN
+	// 176: Takes 16 bytes for SOF/EOF and 10 * 16 = 160 bytes (2 bytes/bit)
+	uint8_t *resp3 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 190);
+	int resp3Len;
+
+	// e-Purse
+	// 144: Takes 16 bytes for SOF/EOF and 8 * 16 = 128 bytes (2 bytes/bit)
+	uint8_t *resp4 = (((uint8_t *)BigBuf) + FREE_BUFFER_OFFSET + 370);
+	int resp4Len;
+
+	// + 1720..
+	uint8_t *receivedCmd = (((uint8_t *)BigBuf) + RECV_CMD_OFFSET);
+	memset(receivedCmd, 0x44, RECV_CMD_SIZE);
+	int len;
+
+	// Prepare card messages
+	ToSendMax = 0;
+
+	// First card answer: SOF
+	CodeIClassTagSOF();
+	memcpy(resp1, ToSend, ToSendMax); resp1Len = ToSendMax;
+
+	// Anticollision CSN
+	CodeIClassTagAnswer(response2, sizeof(response2));
+	memcpy(resp2, ToSend, ToSendMax); resp2Len = ToSendMax;
+
+	// CSN
+	CodeIClassTagAnswer(response3, sizeof(response3));
+	memcpy(resp3, ToSend, ToSendMax); resp3Len = ToSendMax;
+
+	// e-Purse
+	CodeIClassTagAnswer(response4, sizeof(response4));
+	memcpy(resp4, ToSend, ToSendMax); resp4Len = ToSendMax;
+
+	// We need to listen to the high-frequency, peak-detected path.
+	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+	FpgaSetupSsc();
+
+	// To control where we are in the protocol
+	int cmdsRecvd = 0;
+
+	LED_A_ON();
+	bool displayDebug = true;
+	bool buttonPressed = false;
+	while(!exitLoop) {
+		LED_B_OFF();
+		if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) {
+			buttonPressed = true;
+			break;
+		}
+
+		// Okay, look at the command now.
+		if(receivedCmd[0] == 0x0a ) {
+			// Reader in anticollission phase
+			resp = resp1; respLen = resp1Len; //order = 1;
+			respdata = &sof;
+			respsize = sizeof(sof);
+			displayDebug = false;
+		} else if(receivedCmd[0] == 0x0c) {
+			// Reader asks for anticollission CSN
+			resp = resp2; respLen = resp2Len; //order = 2;
+			respdata = response2;
+			respsize = sizeof(response2);
+			displayDebug = false;
+			//DbpString("Reader requests anticollission CSN:");
+		} else if(receivedCmd[0] == 0x81) {
+			// Reader selects anticollission CSN.
+			// Tag sends the corresponding real CSN
+			resp = resp3; respLen = resp3Len; //order = 3;
+			respdata = response3;
+			respsize = sizeof(response3);
+			//DbpString("Reader selects anticollission CSN:");
+		} else if(receivedCmd[0] == 0x88) {
+			// Read e-purse (88 02)
+			resp = resp4; respLen = resp4Len; //order = 4;
+			respdata = response4;
+			respsize = sizeof(response4);
+			LED_B_ON();
+		} else if(receivedCmd[0] == 0x05) {
+			// Reader random and reader MAC!!!
+			// Do not respond
+			// We do not know what to answer, so lets keep quit
+			resp = resp1; respLen = 0; //order = 5;
+			respdata = NULL;
+			respsize = 0;
+			if (breakAfterMacReceived){
+				// TODO, actually return this to the caller instead of just
+				// dbprintf:ing ...
+				Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x");
+				Dbprintf("RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len,
+						 receivedCmd[0], receivedCmd[1], receivedCmd[2],
+						receivedCmd[3], receivedCmd[4], receivedCmd[5],
+						receivedCmd[6], receivedCmd[7], receivedCmd[8]);
+				exitLoop = true;
+			}
+		} else if(receivedCmd[0] == 0x00 && len == 1) {
+			// Reader ends the session
+			resp = resp1; respLen = 0; //order = 0;
+			respdata = NULL;
+			respsize = 0;
+		} else {
+			//#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44
+			// Never seen this command before
+			Dbprintf("Unknown command received from reader (len=%d): %x %x %x %x %x %x %x %x %x",
+			len,
+			receivedCmd[0], receivedCmd[1], receivedCmd[2],
+			receivedCmd[3], receivedCmd[4], receivedCmd[5],
+			receivedCmd[6], receivedCmd[7], receivedCmd[8]);
+			// Do not respond
+			resp = resp1; respLen = 0; //order = 0;
+			respdata = NULL;
+			respsize = 0;
+		}
+
+		if(cmdsRecvd > 999) {
+			DbpString("1000 commands later...");
+			break;
+		}
+		else {
+			cmdsRecvd++;
+		}
+
+		if(respLen > 0) {
+			SendIClassAnswer(resp, respLen, 21);
+
+			if(displayDebug) Dbprintf("R2T:(len=%d): %x %x %x %x %x %x %x %x %x\nT2R: (total/data =%d/%d): %x %x %x %x %x %x %x %x %x",
+			len,
+			receivedCmd[0], receivedCmd[1], receivedCmd[2],
+			receivedCmd[3], receivedCmd[4], receivedCmd[5],
+			receivedCmd[6], receivedCmd[7], receivedCmd[8],
+			respLen,respsize,
+			resp[0], resp[1], resp[2],
+			resp[3], resp[4], resp[5],
+			resp[6], resp[7], resp[8]);
+
+		}
+
+		if (tracing) {
+			//LogTrace(receivedCmd,len, rsamples, Uart.parityBits, TRUE);
+			if(!LogTrace(receivedCmd,len, rsamples, Uart.parityBits,TRUE))
+			{
+				DbpString("Trace full");
+				break;
+			}
+
+			if (respdata != NULL) {
+				//LogTrace(respdata,respsize, rsamples, SwapBits(GetParity(respdata,respsize),respsize), FALSE);
+				//if(!LogTrace(resp,respLen, rsamples,SwapBits(GetParity(respdata,respsize),respsize),FALSE))
+				if(!LogTrace(respdata,respsize, rsamples,SwapBits(GetParity(respdata,respsize),respsize),FALSE))
+				{
+					DbpString("Trace full");
+					break;
+				}
+			}
+		}
+		memset(receivedCmd, 0x44, RECV_CMD_SIZE);
+	}
+
+	Dbprintf("%x", cmdsRecvd);
+	LED_A_OFF();
+	LED_B_OFF();
+	if(buttonPressed)
+	{
+		DbpString("Button pressed");
+	}
+
+	return buttonPressed;
+}
+
+static int SendIClassAnswer(uint8_t *resp, int respLen, int delay)
+{
+	int i = 0, u = 0, d = 0;
+	uint8_t b = 0;
+	// return 0;
+	// Modulate Manchester
+	// FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD424);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
+	AT91C_BASE_SSC->SSC_THR = 0x00;
+	FpgaSetupSsc();
+	
+	// send cycle
+	for(;;) {
+		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+			volatile uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+			(void)b;
+		}
+		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+			if(d < delay) {
+				b = 0x00;
+				d++;
+			}
+			else if(i >= respLen) {
+				b = 0x00;
+				u++;
+			} else {
+				b = resp[i];
+				u++;
+				if(u > 1) { i++; u = 0; }
+			}
+			AT91C_BASE_SSC->SSC_THR = b;
+
+			if(u > 4) break;
+		}
+		if(BUTTON_PRESS()) {
+			break;
+		}
+	}
+
+	return 0;
+}
+
+/// THE READER CODE
+
+//-----------------------------------------------------------------------------
+// Transmit the command (to the tag) that was placed in ToSend[].
+//-----------------------------------------------------------------------------
+static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait)
+{
+  int c;
+
+  FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+  AT91C_BASE_SSC->SSC_THR = 0x00;
+  FpgaSetupSsc();
+
+   if (wait)
+    if(*wait < 10)
+      *wait = 10;
+
+  for(c = 0; c < *wait;) {
+    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+      AT91C_BASE_SSC->SSC_THR = 0x00;		// For exact timing!
+      c++;
+    }
+    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+      volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+      (void)r;
+    }
+    WDT_HIT();
+  }
+
+  uint8_t sendbyte;
+  bool firstpart = TRUE;
+  c = 0;
+  for(;;) {
+    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+
+      // DOUBLE THE SAMPLES!
+      if(firstpart) {
+	sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4); 
+      }
+      else {
+	sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4);
+        c++;
+      }
+      if(sendbyte == 0xff) {
+	sendbyte = 0xfe;
+      }
+      AT91C_BASE_SSC->SSC_THR = sendbyte;
+      firstpart = !firstpart;
+
+      if(c >= len) {
+        break;
+      }
+    }
+    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+      volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+      (void)r;
+    }
+    WDT_HIT();
+  }
+  if (samples) *samples = (c + *wait) << 3;
+}
+
+
+//-----------------------------------------------------------------------------
+// Prepare iClass reader command to send to FPGA
+//-----------------------------------------------------------------------------
+void CodeIClassCommand(const uint8_t * cmd, int len)
+{
+  int i, j, k;
+  uint8_t b;
+
+  ToSendReset();
+
+  // Start of Communication: 1 out of 4
+  ToSend[++ToSendMax] = 0xf0;
+  ToSend[++ToSendMax] = 0x00;
+  ToSend[++ToSendMax] = 0x0f;
+  ToSend[++ToSendMax] = 0x00;
+
+  // Modulate the bytes 
+  for (i = 0; i < len; i++) {
+    b = cmd[i];
+    for(j = 0; j < 4; j++) {
+      for(k = 0; k < 4; k++) {
+	if(k == (b & 3)) {
+	    ToSend[++ToSendMax] = 0x0f;
+	}
+	else {
+	    ToSend[++ToSendMax] = 0x00;
+	}
+      }
+      b >>= 2;
+    }
+  }
+
+  // End of Communication
+  ToSend[++ToSendMax] = 0x00;
+  ToSend[++ToSendMax] = 0x00;
+  ToSend[++ToSendMax] = 0xf0;
+  ToSend[++ToSendMax] = 0x00;
+
+  // Convert from last character reference to length
+  ToSendMax++;
+}
+
+void ReaderTransmitIClass(uint8_t* frame, int len)
+{
+  int wait = 0;
+  int samples = 0;
+  int par = 0;
+
+  // This is tied to other size changes
+  // 	uint8_t* frame_addr = ((uint8_t*)BigBuf) + 2024;
+  CodeIClassCommand(frame,len);
+
+  // Select the card
+  TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
+  if(trigger)
+  	LED_A_ON();
+
+  // Store reader command in buffer
+  if (tracing) LogTrace(frame,len,rsamples,par,TRUE);
+}
+
+//-----------------------------------------------------------------------------
+// Wait a certain time for tag response
+//  If a response is captured return TRUE
+//  If it takes too long return FALSE
+//-----------------------------------------------------------------------------
+static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed) //uint8_t *buffer
+{
+	// buffer needs to be 512 bytes
+	int c;
+
+	// Set FPGA mode to "reader listen mode", no modulation (listen
+	// only, since we are receiving, not transmitting).
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
+
+	// Now get the answer from the card
+	Demod.output = receivedResponse;
+	Demod.len = 0;
+	Demod.state = DEMOD_UNSYNCD;
+
+	uint8_t b;
+	if (elapsed) *elapsed = 0;
+
+	bool skip = FALSE;
+
+	c = 0;
+	for(;;) {
+		WDT_HIT();
+
+	        if(BUTTON_PRESS()) return FALSE;
+
+		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+			AT91C_BASE_SSC->SSC_THR = 0x00;  // To make use of exact timing of next command from reader!!
+			if (elapsed) (*elapsed)++;
+		}
+		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+			if(c < timeout) { c++; } else { return FALSE; }
+			b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
+			skip = !skip;
+			if(skip) continue;
+			/*if(ManchesterDecoding((b>>4) & 0xf)) {
+				*samples = ((c - 1) << 3) + 4;
+				return TRUE;
+			}*/
+			if(ManchesterDecoding(b & 0x0f)) {
+				*samples = c << 3;
+				return  TRUE;
+			}
+		}
+	}
+}
+
+int ReaderReceiveIClass(uint8_t* receivedAnswer)
+{
+  int samples = 0;
+  if (!GetIClassAnswer(receivedAnswer,160,&samples,0)) return FALSE;
+  rsamples += samples;
+  if (tracing) LogTrace(receivedAnswer,Demod.len,rsamples,Demod.parityBits,FALSE);
+  if(samples == 0) return FALSE;
+  return Demod.len;
+}
+
+// Reader iClass Anticollission
+void ReaderIClass(uint8_t arg0) {
+	uint8_t act_all[]     = { 0x0a };
+	uint8_t identify[]    = { 0x0c };
+	uint8_t select[]      = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+	uint8_t* resp = (((uint8_t *)BigBuf) + 3560);	// was 3560 - tied to other size changes
+
+	// Reset trace buffer
+	memset(trace, 0x44, RECV_CMD_OFFSET);
+	traceLen = 0;
+
+	// Setup SSC
+	FpgaSetupSsc();
+	// Start from off (no field generated)
+	// Signal field is off with the appropriate LED
 	LED_D_OFF();
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	SpinDelay(200);
+
+	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+
+	// Now give it time to spin up.
+	// Signal field is on with the appropriate LED
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+	SpinDelay(200);
+
+	LED_A_ON();
+
+	for(;;) {
+	
+		if(traceLen > TRACE_SIZE) {
+			DbpString("Trace full");
+			break;
+		}
+		
+		if (BUTTON_PRESS()) break;
+
+		// Send act_all
+		ReaderTransmitIClass(act_all, 1);
+		// Card present?
+		if(ReaderReceiveIClass(resp)) {
+			ReaderTransmitIClass(identify, 1);
+			if(ReaderReceiveIClass(resp) == 10) {
+				// Select card          
+				memcpy(&select[1],resp,8);
+				ReaderTransmitIClass(select, sizeof(select));
+
+				if(ReaderReceiveIClass(resp) == 10) {
+					Dbprintf("     Selected CSN: %02x %02x %02x %02x %02x %02x %02x %02x",
+					resp[0], resp[1], resp[2],
+					resp[3], resp[4], resp[5],
+					resp[6], resp[7]);
+				}
+				// Card selected, whats next... ;-)
+			}
+		}
+		WDT_HIT();
+	}
+	
+	LED_A_OFF();
 }
 
+