From 750b7c8d4bb06efd3dcbbb65a6b22678887cf6ac Mon Sep 17 00:00:00 2001
From: merlokk <olegmsn@gmail.com>
Date: Mon, 20 Nov 2017 23:57:06 +0200
Subject: [PATCH] changed apdu_res_len to 260 and replaced all the costants

---
 client/emv/cmdemv.c  |  3 ---
 client/emv/emvcore.c | 12 ++++++------
 client/emv/emvcore.h |  3 +++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 56b48d9b..58857dc5 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -10,9 +10,6 @@
 
 #include "cmdemv.h"
 
-#define APDU_RES_LEN 520
-#define APDU_AID_LEN 50
-
 int UsageCmdHFEMVSelect(void) {
 	PrintAndLog("HELP :  Executes select applet command:\n");
 	PrintAndLog("Usage:  hf emv select [-s][-k][-t] <HEX applet AID>\n");
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index b2ce29b8..7481af4f 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -138,7 +138,7 @@ void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
 
 
 int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	uint8_t data[260] = {0};
+	uint8_t data[APDU_RES_LEN] = {0};
 	*ResultLen = 0;
 	if (sw)	*sw = 0;
 	uint16_t isw = 0;
@@ -192,7 +192,7 @@ int EMVSelect(bool ActivateField, bool LeaveFieldON, uint8_t *AID, size_t AIDLen
 }
 
 int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw) {
-	uint8_t buf[50] = {0};
+	uint8_t buf[APDU_AID_LEN] = {0};
 	*ResultLen = 0;
 	int len = 0;
 	int res = 0;
@@ -214,7 +214,7 @@ int EMVSelectPSE(bool ActivateField, bool LeaveFieldON, uint8_t PSENum, uint8_t
 }
 
 int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
-	uint8_t data[260] = {0};
+	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
 	uint16_t sw = 0;
 	int res;
@@ -282,9 +282,9 @@ int EMVSearchPSE(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct t
 }
 
 int EMVSearch(bool ActivateField, bool LeaveFieldON, bool decodeTLV, struct tlvdb *tlv) {
-	uint8_t aidbuf[50] = {0};
+	uint8_t aidbuf[APDU_AID_LEN] = {0};
 	int aidlen = 0;
-	uint8_t data[260] = {0};
+	uint8_t data[APDU_RES_LEN] = {0};
 	size_t datalen = 0;
 	uint16_t sw = 0;
 	
@@ -363,7 +363,7 @@ int EMVSelectApplication(struct tlvdb *tlv, uint8_t *AID, size_t *AIDlen) {
 }
 
 int EMVGPO(bool LeaveFieldON, uint8_t *PDOL, size_t PDOLLen, uint8_t *Result, size_t MaxResultLen, size_t *ResultLen, uint16_t *sw, struct tlvdb *tlv) {
-	uint8_t data[260] = {0};
+	uint8_t data[APDU_RES_LEN] = {0};
 	*ResultLen = 0;
 	if (sw)	*sw = 0;
 	uint16_t isw = 0;
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 64d59585..fdd3ab86 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -26,6 +26,9 @@
 #include "emv/dump.h"
 #include "emv/emv_tags.h"
 
+#define APDU_RES_LEN 260
+#define APDU_AID_LEN 50
+
 extern void TLVPrintFromBuffer(uint8_t *data, int datalen);
 extern void TLVPrintFromTLV(struct tlvdb *tlv);
 extern void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv);