X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a501c82b196b614295a6e3bf7481da84affb0d8e..f5ed4d12de19dcf59a3d5ecdcd9f75f5c747dd3e:/armsrc/iso14443a.c?ds=sidebyside

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index aed6a1fe..d8edc209 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -310,10 +310,11 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time)
 	if (Uart.state == STATE_UNSYNCD) {											// not yet synced
 	
 		if (Uart.highCnt < 7) {													// wait for a stable unmodulated signal
-			if (Uart.twoBits == 0xffff)
+			if (Uart.twoBits == 0xffff) {
 				Uart.highCnt++;
-			else
+			} else {
 				Uart.highCnt = 0;
+			}
 		} else {
 			Uart.syncBit = 0xFFFF; // not set
 			// look for 00xx1111 (the start bit)
@@ -1602,8 +1603,7 @@ int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par){
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
 				 uint8_t *tag_data, uint16_t tag_len, uint32_t tag_StartTime, uint32_t tag_EndTime, uint8_t *tag_Parity)
 {
-	if (!tracing) return true;
-
+	if (tracing) {
 	// we cannot exactly measure the end and start of a received command from reader. However we know that the delay from
 	// end of the received command to start of the tag's (simulated by us) answer is n*128+20 or n*128+84 resp.
 	// with n >= 9. The start of the tags answer can be measured and therefore the end of the received command be calculated:
@@ -1614,8 +1614,10 @@ bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_Start
 	reader_StartTime = reader_EndTime - reader_modlen;
 	if (!LogTrace(reader_data, reader_len, reader_StartTime, reader_EndTime, reader_Parity, TRUE)) {
 		return FALSE;
-	} else 
-		return(!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, FALSE));
+		} else return(!LogTrace(tag_data, tag_len, tag_StartTime, tag_EndTime, tag_Parity, FALSE));
+	} else {
+		return TRUE;
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -1703,7 +1705,6 @@ int ReaderReceiveOffset(uint8_t* receivedAnswer, uint16_t offset, uint8_t *parit
 int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
 {
 	if (!GetIso14443aAnswerFromTag(receivedAnswer, parity, 0)) return FALSE;
-
 	if (tracing) {
 		LogTrace(receivedAnswer, Demod.len, Demod.startTime*16 - DELAY_AIR2ARM_AS_READER, Demod.endTime*16 - DELAY_AIR2ARM_AS_READER, parity, FALSE);
 	}
@@ -1714,7 +1715,7 @@ int ReaderReceive(uint8_t *receivedAnswer, uint8_t *parity)
  * fills the uid pointer unless NULL
  * fills resp_data unless NULL */
 int iso14443a_select_card(byte_t* uid_ptr, iso14a_card_select_t* p_hi14a_card, uint32_t* cuid_ptr) {
-	uint8_t halt[]       = { 0x50 };  // HALT
+	//uint8_t halt[]       = { 0x50, 0x00, 0x57, 0xCD };  // HALT
 	uint8_t wupa[]       = { 0x52 };  // WAKE-UP
 	//uint8_t reqa[]       = { 0x26 };  // REQUEST A
 	uint8_t sel_all[]    = { 0x93,0x20 };
@@ -1725,30 +1726,30 @@ int iso14443a_select_card(byte_t* uid_ptr, iso14a_card_select_t* p_hi14a_card, u
 
 	byte_t uid_resp[4];
 	size_t uid_resp_len;
-
-  uint8_t sak = 0x04; // cascade uid
-  int cascade_level = 0;
-  int len;
+	uint8_t sak = 0x04; // cascade uid
+	int cascade_level = 0;
+	int len;
 	
-  ReaderTransmit(halt,sizeof(halt), NULL);
+	// test for the SKYLANDERS TOY.
+	//ReaderTransmit(halt,sizeof(halt), NULL);
+	//len = ReaderReceive(resp, resp_par);
 	
-  // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
-  ReaderTransmitBitsPar(wupa,7,0, NULL);
+	// Broadcast for a card, WUPA (0x52) will force response from all cards in the field
+	ReaderTransmitBitsPar(wupa,7,0, NULL);
 	
-  // Receive the ATQA
-  if(!ReaderReceive(resp, resp_par)) return 0;
-  // Dbprintf("atqa: %02x %02x",resp[0],resp[1]);
-
-  if(p_hi14a_card) {
-    memcpy(p_hi14a_card->atqa, resp, 2);
-    p_hi14a_card->uidlen = 0;
-    memset(p_hi14a_card->uid,0,10);
-  }
+	// Receive the ATQA
+	if(!ReaderReceive(resp, resp_par)) return 0;
+	
+	if(p_hi14a_card) {
+		memcpy(p_hi14a_card->atqa, resp, 2);
+		p_hi14a_card->uidlen = 0;
+		memset(p_hi14a_card->uid,0,10);
+	}
 
-  // clear uid
-  if (uid_ptr) {
-    memset(uid_ptr,0,10);
-  }
+	// clear uid
+	if (uid_ptr) {
+		memset(uid_ptr,0,10);
+	}
 
   // OK we will select at least at cascade 1, lets see if first byte of UID was 0x88 in
   // which case we need to make a cascade 2 request and select - this is a long UID
@@ -1794,7 +1795,6 @@ int iso14443a_select_card(byte_t* uid_ptr, iso14a_card_select_t* p_hi14a_card, u
 	}
 	uid_resp_len = 4;
 
-
     // calculate crypto UID. Always use last 4 Bytes.
     if(cuid_ptr) {
         *cuid_ptr = bytes_to_num(uid_resp, 4);
@@ -1810,18 +1810,11 @@ int iso14443a_select_card(byte_t* uid_ptr, iso14a_card_select_t* p_hi14a_card, u
     // Receive the SAK
     if (!ReaderReceive(resp, resp_par)) return 0;
     sak = resp[0];
-
-	//Dbprintf("SAK: %02x",resp[0]);
 	
-    // Test if more parts of the uid are comming
+    // Test if more parts of the uid are coming
     if ((sak & 0x04) /* && uid_resp[0] == 0x88 */) {
 		// Remove first byte, 0x88 is not an UID byte, it CT, see page 3 of:
 		// http://www.nxp.com/documents/application_note/AN10927.pdf
-		// This was earlier:
-		//memcpy(uid_resp, uid_resp + 1, 3);
-		// But memcpy should not be used for overlapping arrays,
-		// and memmove appears to not be available in the arm build.
-		// Therefore:
 		uid_resp[0] = uid_resp[1];
 		uid_resp[1] = uid_resp[2];
 		uid_resp[2] = uid_resp[3]; 
@@ -1844,24 +1837,25 @@ int iso14443a_select_card(byte_t* uid_ptr, iso14a_card_select_t* p_hi14a_card, u
     p_hi14a_card->ats_len = 0;
   }
 
-  if( (sak & 0x20) == 0) {
-    return 2; // non iso14443a compliant tag
-  }
+	if( (sak & 0x20) == 0) {
+		return 2; // non iso14443a compliant tag
+	}
 
-  // Request for answer to select
-  AppendCrc14443a(rats, 2);
-  ReaderTransmit(rats, sizeof(rats), NULL);
+	// Request for answer to select
+	AppendCrc14443a(rats, 2);
+	ReaderTransmit(rats, sizeof(rats), NULL);
 
-  if (!(len = ReaderReceive(resp,resp_par))) return 0;
+	len = ReaderReceive(resp, resp_par);
+	if(!len) return 0;
 
-  if(p_hi14a_card) {
-    memcpy(p_hi14a_card->ats, resp, sizeof(p_hi14a_card->ats));
-    p_hi14a_card->ats_len = len;
-  }
+	if(p_hi14a_card) {
+		memcpy(p_hi14a_card->ats, resp, sizeof(p_hi14a_card->ats));
+		p_hi14a_card->ats_len = len;
+	}
 
-  // reset the PCB block number
-  iso14_pcb_blocknum = 0;
-  return 1;
+	// reset the PCB block number
+	iso14_pcb_blocknum = 0;
+	return 1;
 }
 
 void iso14443a_setup(uint8_t fpga_minor_mode) {