X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7bc95e2e43c0b00b72fc794b18c26a880ac19d1c..57642f63fa9440e6e5e19841c5dd98dee9f5eaa5:/armsrc/epa.c

diff --git a/armsrc/epa.c b/armsrc/epa.c
index b0ae5e0d..fb19656d 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -108,9 +108,9 @@ size_t EPA_Parse_CardAccess(uint8_t *data,
 		if (data[index] == 0x31 || data[index] == 0x30) {
 			// enter the set (skip tag + length)
 			index += 2;
-			// extended length
+			// check for extended length
 			if ((data[index - 1] & 0x80) != 0) {
-				index += (data[index] & 0x7F);
+				index += (data[index-1] & 0x7F);
 			}
 		}
 		// OID
@@ -419,7 +419,7 @@ int EPA_Setup()
 	// return code
 	int return_code = 0;
 	// card UID
-	uint8_t uid[8];
+	uint8_t uid[10];
 	// card select information
 	iso14a_card_select_t card_select_info;
 	// power up the field
@@ -434,7 +434,8 @@ int EPA_Setup()
 	// send the PPS request
 	ReaderTransmit((uint8_t *)pps, sizeof(pps), NULL);
 	uint8_t pps_response[3];
-	return_code = ReaderReceive(pps_response);
+	uint8_t pps_response_par[1];
+	return_code = ReaderReceive(pps_response, pps_response_par);
 	if (return_code != 3 || pps_response[0] != 0xD0) {
 		return return_code == 0 ? 2 : return_code;
 	}