From: frederikmoellers@aol.de <frederikmoellers@aol.de@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Fri, 24 Aug 2012 21:00:03 +0000 (+0000)
Subject: -Fixed a bug in iso14_apdu
X-Git-Tag: v1.0.0~150
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b0127e65f1bef754e0ac72893e2ba99f9ca7f106

-Fixed a bug in iso14_apdu
 -According to ISO14443-4, the block number (bit 0) in the PCB needs to be flipped every once in a while. Not doing so leads to the card not responding to commands anymore. The flipping is done according to the standard now.
-Declare iso14_apdu in iso14443a.h to enable usage from other .c files
-iso14_apdu now returns 0 if ReaderReceive returned 0 (to distinguish between the case that ReaderReceive returns -1 and the case that it returns 0)
-Added a new function to change the timeout (to enable changing it from other .c files without the need for a global variable)
---

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 6b481df2..530418e5 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -26,6 +26,8 @@ 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
@@ -72,6 +74,9 @@ void iso14a_clear_tracelen(void) {
 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
@@ -1702,6 +1707,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 +1736,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 +1809,7 @@ void ReaderIso14443a(UsbCommand * c, UsbCommand * ack)
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 }
+
 //-----------------------------------------------------------------------------
 // Read an ISO 14443a tag. Send out commands and store answers.
 //
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 1a5766c8..b8f56c15 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -89,8 +89,10 @@ extern int ReaderReceive(uint8_t* receivedAnswer);
 extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr);
 
 extern void iso14443a_setup();
+extern int iso14_apdu(uint8_t * cmd, size_t cmd_len, void * data);
 extern int iso14443a_select_card(uint8_t * uid_ptr, iso14a_card_select_t * resp_data, uint32_t * cuid_ptr);
 extern void iso14a_set_trigger(int enable);
+extern void iso14a_set_timeout(uint32_t timeout);
 
 extern void iso14a_clear_tracelen(void);
 extern void iso14a_set_tracing(int enable);