X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3fe4ff4f0329d6bde9585b77966d42dfc3f612f5..6c81ae5574e2f2b9e0b62f9dafe602d35f23739a:/armsrc/epa.c

diff --git a/armsrc/epa.c b/armsrc/epa.c
index bec79e61..9012bf11 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -13,7 +13,8 @@
 
 #include "iso14443a.h"
 #include "epa.h"
-#include "cmd.h"
+#include "../common/cmd.h"
+
 
 // Protocol and Parameter Selection Request
 // use regular (1x) speed in both directions
@@ -224,7 +225,7 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return)
 	EPA_Finish();
 	
 	// send the USB packet
-  cmd_send(CMD_ACK,step,func_return,0,0,0);
+	cmd_send(CMD_ACK,step,func_return,0,0,0);
 }
 
 //-----------------------------------------------------------------------------
@@ -252,24 +253,25 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 	
 	// set up communication
 	func_return = EPA_Setup();
-	if (func_return != 0) {
+	if (func_return != 0) {	
 		EPA_PACE_Collect_Nonce_Abort(1, func_return);
+		Dbprintf("epa: setup fucked up! %d", func_return);
 		return;
 	}
 
-	// increase the timeout (at least some cards really do need this!)
-	iso14a_set_timeout(0x0002FFFF);
-	
 	// read the CardAccess file
 	// this array will hold the CardAccess file
 	uint8_t card_access[256] = {0};
 	int card_access_length = EPA_Read_CardAccess(card_access, 256);
 	// the response has to be at least this big to hold the OID
 	if (card_access_length < 18) {
+		Dbprintf("epa: Too small!");
 		EPA_PACE_Collect_Nonce_Abort(2, card_access_length);
 		return;
 	}
 
+	Dbprintf("epa: foo!");
+	
 	// this will hold the PACE info of the card
 	pace_version_info_t pace_version_info;
 	// search for the PACE OID
@@ -281,6 +283,8 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 		return;
 	}
 	
+	Dbprintf("epa: bar!");
+	
 	// initiate the PACE protocol
 	// use the CAN for the password since that doesn't change
 	func_return = EPA_PACE_MSE_Set_AT(pace_version_info, 2);
@@ -302,7 +306,7 @@ void EPA_PACE_Collect_Nonce(UsbCommand *c)
 	// save received information
 //	ack->arg[1] = func_return;
 //	memcpy(ack->d.asBytes, nonce, func_return);
-  cmd_send(CMD_ACK,0,func_return,0,nonce,func_return);
+	cmd_send(CMD_ACK,0,func_return,0,nonce,func_return);
 }
 
 //-----------------------------------------------------------------------------
@@ -425,8 +429,6 @@ int EPA_Setup()
 
 	// power up the field
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
-
-	iso14a_set_timeout(10500);
 	
 	// select the card
 	return_code = iso14443a_select_card(uid, &card_select_info, NULL);