X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/39864b0bd41dd5e896bcb8eeabcf2c3932f2203a..d19929cbe8d681b60496ca6d9d9cbd806822e163:/armsrc/iso14443a.c

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a564a32f..af7b3545 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -21,11 +21,13 @@
 #include "mifareutil.h"
 
 static uint32_t iso14a_timeout;
-uint8_t *trace = (uint8_t *) BigBuf;
+uint8_t *trace = (uint8_t *) BigBuf+TRACE_OFFSET;
 int traceLen = 0;
 int rsamples = 0;
 int tracing = TRUE;
 uint8_t trigger = 0;
+// the block number for the ISO14443-4 PCB
+static uint8_t iso14_pcb_blocknum = 0;
 
 // CARD TO READER - manchester
 // Sequence D: 11110000 modulation with subcarrier during first half
@@ -66,13 +68,19 @@ void iso14a_set_trigger(int enable) {
 	trigger = enable;
 }
 
-void iso14a_clear_tracelen(void) {
+void iso14a_clear_trace(void) {
+    memset(trace, 0x44, TRACE_SIZE);
 	traceLen = 0;
 }
+
 void iso14a_set_tracing(int enable) {
 	tracing = enable;
 }
 
+void iso14a_set_timeout(uint32_t timeout) {
+	iso14a_timeout = timeout;
+}
+
 //-----------------------------------------------------------------------------
 // Generate the parity value for a byte sequence
 //
@@ -575,8 +583,7 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
 	
 	LEDsoff();
 	// init trace buffer
-	traceLen = 0;
-	memset(trace, 0x44, TRACE_SIZE);
+    iso14a_clear_trace();
 
 	// 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
@@ -900,8 +907,7 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
 {
   // Enable and clear the trace
 	tracing = TRUE;
-	traceLen = 0;
-  memset(trace, 0x44, TRACE_SIZE);
+  iso14a_clear_trace();
 
 	// This function contains the tag emulation
 	uint8_t sak;
@@ -1702,6 +1708,9 @@ int iso14443a_select_card(uint8_t * uid_ptr, iso14a_card_select_t * resp_data, u
 		resp_data->ats_len = len;
 	}
 	
+	// reset the PCB block number
+	iso14_pcb_blocknum = 0;
+	
 	return 1;
 }
 
@@ -1728,19 +1737,30 @@ void iso14443a_setup() {
 int iso14_apdu(uint8_t * cmd, size_t cmd_len, void * data) {
 	uint8_t real_cmd[cmd_len+4];
 	real_cmd[0] = 0x0a; //I-Block
+	// put block number into the PCB
+	real_cmd[0] |= iso14_pcb_blocknum;
 	real_cmd[1] = 0x00; //CID: 0 //FIXME: allow multiple selected cards
 	memcpy(real_cmd+2, cmd, cmd_len);
 	AppendCrc14443a(real_cmd,cmd_len+2);
  
 	ReaderTransmit(real_cmd, cmd_len+4);
 	size_t len = ReaderReceive(data);
-	if(!len)
-		return -1; //DATA LINK ERROR
-	
+	uint8_t * data_bytes = (uint8_t *) data;
+	if (!len)
+		return 0; //DATA LINK ERROR
+	// if we received an I- or R(ACK)-Block with a block number equal to the
+	// current block number, toggle the current block number
+	else if (len >= 4 // PCB+CID+CRC = 4 bytes
+	         && ((data_bytes[0] & 0xC0) == 0 // I-Block
+	             || (data_bytes[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+	         && (data_bytes[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
+	{
+		iso14_pcb_blocknum ^= 1;
+	}
+
 	return len;
 }
 
-
 //-----------------------------------------------------------------------------
 // Read an ISO 14443a tag. Send out commands and store answers.
 //
@@ -1790,6 +1810,7 @@ void ReaderIso14443a(UsbCommand * c, UsbCommand * ack)
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 }
+
 //-----------------------------------------------------------------------------
 // Read an ISO 14443a tag. Send out commands and store answers.
 //
@@ -2359,8 +2380,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	// C(red) A(yellow) B(green)
 	LEDsoff();
 	// init trace buffer
-	traceLen = 0;
-	memset(trace, 0x44, TRACE_SIZE);
+    iso14a_clear_trace();
 
 	// The command (reader -> tag) that we're receiving.
 	// The length of a received command will in most cases be no more than 18 bytes.
@@ -2416,7 +2436,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 		
 		if (++sniffCounter > 65) {
 			if (MfSniffSend(2000)) {
-				AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;
+				FpgaEnableSscDma();
 			}
 			sniffCounter = 0;
 		}
@@ -2442,7 +2462,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 		if (!AT91C_BASE_PDC_SSC->PDC_RCR) {
 			AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) dmaBuf;
 			AT91C_BASE_PDC_SSC->PDC_RCR = DMA_BUFFER_SIZE;
-			Dbprintf("RxEmpty ERROR!!! %d", dataLen); // temporary
+			Dbprintf("RxEmpty ERROR!!! data length:%d", dataLen); // temporary
 		}
 		// secondary buffer sets as primary, secondary buffer was stopped
 		if (!AT91C_BASE_PDC_SSC->PDC_RNCR) {
@@ -2455,7 +2475,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 		if(MillerDecoding((data[0] & 0xF0) >> 4)) {
 			LED_C_INV();
 			// check - if there is a short 7bit request from reader
-			if (MfSniffLogic(receivedCmd, Uart.byteCnt, Uart.bitCnt, TRUE)) break;
+			if (MfSniffLogic(receivedCmd, Uart.byteCnt, Uart.parityBits, Uart.bitCnt, TRUE)) break;
 
 			/* And ready to receive another command. */
 			Uart.state = STATE_UNSYNCD;
@@ -2467,7 +2487,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 		if(ManchesterDecoding(data[0] & 0x0F)) {
 			LED_C_INV();
 
-			if (MfSniffLogic(receivedResponse, Demod.len, Uart.bitCnt, FALSE)) break;
+			if (MfSniffLogic(receivedResponse, Demod.len, Demod.parityBits, Demod.bitCount, FALSE)) break;
 
 			// And ready to receive another response.
 			memset(&Demod, 0, sizeof(Demod));
@@ -2487,10 +2507,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	DbpString("COMMAND FINISHED");
 
 done:
-	AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
+	FpgaDisableSscDma();
 	MfSniffEnd();
 	
-	Dbprintf("maxDataLen=%x, Uart.state=%x, Uart.byteCnt=%x", maxDataLen, Uart.state, Uart.byteCnt);
-	Dbprintf("Uart.byteCntMax=%x, traceLen=%x", Uart.byteCntMax, traceLen);
+	Dbprintf("maxDataLen=%x, Uart.state=%x, Uart.byteCnt=%x Uart.byteCntMax=%x", maxDataLen, Uart.state, Uart.byteCnt, Uart.byteCntMax);
 	LEDsoff();
 }
\ No newline at end of file