From 122cbe7d1dded6ed384663f38a6996afd1a40f6c Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 24 Oct 2018 19:19:15 +0300
Subject: [PATCH] info and some fix in exchange

---
 client/cmdhf14a.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index de1854630..7880bf38f 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -669,10 +669,12 @@ int CmdHF14ASniff(const char *Cmd) {
 }
 
 int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	static bool responseNum = false;
 	uint16_t cmdc = 0;
 	*dataoutlen = 0;
 	
 	if (activateField) {
+		responseNum = false;
 		UsbCommand resp;
 
 		// Anticollision + SELECT card
@@ -685,7 +687,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 
 		// check result
 		if (resp.arg[0] == 0) {
-			PrintAndLogEx(NORMAL, "No card in field.");
+			PrintAndLogEx(ERR, "No card in field.");
 			return 1;
 		}
 
@@ -715,8 +717,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 	if (leaveSignalON)
 		cmdc |= ISO14A_NO_DISCONNECT;
 
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF), 0}}; 
-	memcpy(c.d.asBytes, datain, datainlen);
+	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}}; 
+	uint8_t header[] = {0x0a | responseNum, 0x00};
+	responseNum ^= 1;
+	memcpy(c.d.asBytes, header, 2);
+	memcpy(&c.d.asBytes[2], datain, datainlen);
 	SendCommand(&c);
 	
     uint8_t *recv;
@@ -726,6 +731,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
         recv = resp.d.asBytes;
         int iLen = resp.arg[0];
 		
+        if(!iLen) {
+			PrintAndLogEx(ERR, "No card response.");
+            return 1;
+		}
+		
 		*dataoutlen = iLen - 2;
 		if (*dataoutlen < 0)
 			*dataoutlen = 0;
@@ -735,13 +745,13 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
 			return 2;
 		}
 		
-		memcpy(dataout, recv, *dataoutlen);
-		
-        if(!iLen) {
-			PrintAndLogEx(ERR, "No card response.");
-            return 1;
+		if (recv[0] != header[0]) {
+			PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
+			return 2;
 		}
-
+		
+		memcpy(dataout, &recv[2], *dataoutlen);
+		
 		// CRC Check
 		if (iLen == -1) {
 			PrintAndLogEx(ERR, "ISO 14443A CRC error.");