From eb6e8de45dcbf97b15812f88cfeb6b525a5e566e Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Fri, 3 Nov 2017 13:42:38 +0200
Subject: [PATCH] moved includes, added clear_trace flag (it was there...) and
 fixed multiapdu iso14443 stream

---
 armsrc/iso14443a.c |  7 +++----
 client/cmdhf14a.c  | 37 +++++++++++++++++++++++++++++++++----
 client/cmdhf14a.h  | 15 +--------------
 include/mifare.h   |  3 ++-
 4 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 5a27e06b..90e8538e 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1916,19 +1916,18 @@ void ReaderIso14443a(UsbCommand *c)
 	uint8_t par[MAX_PARITY_SIZE];
 	bool cantSELECT = false;
   
-	if(param & ISO14A_CONNECT) {
+	set_tracing(true);
+	
+	if(param & ISO14A_CLEAR_TRACE) {
 		clear_trace();
 	}
 
-	set_tracing(true);
-
 	if(param & ISO14A_REQUEST_TRIGGER) {
 		iso14a_set_trigger(true);
 	}
 
 	if(param & ISO14A_CONNECT) {
 		LED_A_ON();
-		clear_trace();
 		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 		if(!(param & ISO14A_NO_SELECT)) {
 			iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 1ae63ada..c2d12fd9 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -11,9 +11,25 @@
 
 #include "cmdhf14a.h"
 
+#include "util.h"
+#include "util_posix.h"
+#include "iso14443crc.h"
+#include "data.h"
+#include "proxmark3.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "common.h"
+#include "cmdmain.h"
+#include "mifare.h"
+#include "cmdhfmfu.h"
+#include "mifarehost.h"
+#include "emv/apduinfo.h"
+#include "emv/emvcore.h"
+
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
+
 const manufactureName manufactureMapping[] = {
 	// ID,  "Vendor Country"
 	{ 0x01, "Motorola UK" },
@@ -621,17 +637,22 @@ int CmdHF14ASnoop(const char *Cmd) {
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen) {
 	uint8_t data[USB_CMD_DATA_SIZE];
 	int datalen;
-	uint8_t cmdc = 0;
+	uint16_t cmdc = 0;
 	uint8_t first, second;
+	static uint8_t iso14_pcb_blocknum;
 	
-	if (activateField)
-		cmdc |= ISO14A_CONNECT;
+	if (activateField) {
+		cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+		iso14_pcb_blocknum = 0;
+	}
 	if (leaveSignalON)
 		cmdc |= ISO14A_NO_DISCONNECT;
 
 	// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
 	memcpy(data + 1, datain, datainlen);
 	data[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
+	data[0] += iso14_pcb_blocknum; // add block number (bnr)
+
 	datalen = datainlen + 1;
 	
 	ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
@@ -673,6 +694,14 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
 			PrintAndLog("APDU ERROR: Small APDU response.");
 			return 2;
 		}
+
+		// invert block number field in PCB byte
+		if ( ((recv[0] & 0xC0) == 0 // I-Block
+			   || (recv[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+			 && (recv[0] & 0x01) == iso14_pcb_blocknum) // equal block numbers
+		{
+			iso14_pcb_blocknum ^= 1;
+		}
 		
 		// check block
 		if (data[0] != recv[0]) {
@@ -905,7 +934,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
 	if(active || active_select)
 	{
-		c.arg[0] |= ISO14A_CONNECT;
+		c.arg[0] |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
 		if(active)
 			c.arg[0] |= ISO14A_NO_SELECT;
 	}
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 16e03574..e7784de2 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -18,20 +18,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
-#include "util.h"
-#include "util_posix.h"
-#include "iso14443crc.h"
-#include "data.h"
-#include "proxmark3.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "common.h"
-#include "cmdmain.h"
-#include "mifare.h"
-#include "cmdhfmfu.h"
-#include "mifarehost.h"
-#include "emv/apduinfo.h"
-#include "emv/emvcore.h"
+#include <stdbool.h>
 
 // structure and database for uid -> tagtype lookups 
 typedef struct { 
diff --git a/include/mifare.h b/include/mifare.h
index bede67a9..b821f32b 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -35,7 +35,8 @@ typedef enum ISO14A_COMMAND {
 	ISO14A_SET_TIMEOUT =		(1 << 6),
 	ISO14A_NO_SELECT =			(1 << 7),
 	ISO14A_TOPAZMODE =			(1 << 8),
-	ISO14A_NO_RATS =			(1 << 9)
+	ISO14A_NO_RATS =			(1 << 9),
+	ISO14A_CLEAR_TRACE =		(1 << 10)
 } iso14a_command_t;
 
 typedef struct {
-- 
2.39.2