From ec3acc7d8af7b833aab655ce4ae2935a652edc6a Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 5 Dec 2018 19:23:13 +0200
Subject: [PATCH] some of emv commands works in test mode

---
 client/cmdsmartcard.c | 33 +++++++++++++++++++++++++++++++--
 client/emv/emvcore.c  |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 0173e0ca2..d02e93477 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -87,6 +87,14 @@ static bool smart_select(bool silent) {
 		if (!silent) PrintAndLogEx(WARNING, "smart card select failed");
 		return false;
 	}	
+
+	if (!silent) {
+		smart_card_atr_t card;
+		memcpy(&card, (smart_card_atr_t *)resp.d.asBytes, sizeof(smart_card_atr_t));
+		
+		PrintAndLogEx(INFO, "ISO7816-3 ATR : %s", sprint_hex(card.atr, card.atr_len));	
+	}
+
 	return true;
 }
 
@@ -124,8 +132,8 @@ static int smart_response(uint8_t *data) {
 		goto out;
 	}
 
-	PrintAndLogEx(INFO, "Requesting response");	
-	uint8_t getstatus[] = {0x00, ISO7816_GETSTATUS, 0x00, 0x00, len };
+	PrintAndLogEx(INFO, "Requesting response. len=0x%x", len);	
+	uint8_t getstatus[] = {ISO7816_GETSTATUS, 0x00, 0x00, len};
 	UsbCommand cStatus = {CMD_SMART_RAW, {SC_RAW, sizeof(getstatus), 0}};	
 	memcpy(cStatus.d.asBytes, getstatus, sizeof(getstatus) );
 	clearCommandBuffer();
@@ -245,6 +253,27 @@ int CmdSmartRaw(const char *Cmd) {
 }
 
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+	*dataoutlen = 0;
+	
+	if (activateCard)
+		smart_select(false);
+	printf("* APDU SC\n");
+
+	UsbCommand c = {CMD_SMART_RAW, {SC_RAW | SC_CONNECT, datainlen, 0}};	
+	if (activateCard) {
+		c.arg[0] |= SC_SELECT;
+	}
+	memcpy(c.d.asBytes, datain, datainlen);
+	clearCommandBuffer();
+	SendCommand(&c);	
+	
+	int len = smart_response(dataout);
+	
+	if ( len < 0 ) {
+		return 2;
+	}
+	
+	*dataoutlen = len;
 
 	return 0;
 }	
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 7df706e8e..fcf0bf81f 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -261,7 +261,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
 		break;
 	case ECC_CONTACT:
 		//int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
-		res = ExchangeAPDU14a(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
+		res = ExchangeAPDUSC(data, (IncludeLe?6:5) + apdu.Lc, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
 		if (res) {
 			return res;
 		}