From: Iceman <iceman@iuse.se>
Date: Tue, 12 Dec 2017 14:50:53 +0000 (+0100)
Subject: Merge pull request #515 from pwpiwi/fix_14atimeout
X-Git-Tag: v3.1.0~107
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/feb1bf41848aa8e618d4926aa4beef885fd7b32d?hp=bc3b2f7f9422d8d112b48fa46c0d3fa8446285ec

Merge pull request #515 from pwpiwi/fix_14atimeout

fix: hf mf hardnested failed with new WUPA timing
---

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a0fe2326..94ca52f5 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -189,13 +189,14 @@ void iso14a_set_trigger(bool enable) {
 
 
 void iso14a_set_timeout(uint32_t timeout) {
-	iso14a_timeout = timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8);
+	// adjust timeout by FPGA delays and 2 additional ssp_frames to detect SOF
+	iso14a_timeout = timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) + 2;
 	if(MF_DBGLEVEL >= 3) Dbprintf("ISO14443A Timeout set to %ld (%dms)", timeout, timeout / 106);
 }
 
 
 uint32_t iso14a_get_timeout(void) {
-	return iso14a_timeout + (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8);
+	return iso14a_timeout - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/(16*8) - 2;
 }
 
 //-----------------------------------------------------------------------------
@@ -1955,9 +1956,9 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
 	} else{
 		// S-Block WTX 
 		while((data_bytes[0] & 0xF2) == 0xF2) {
-			uint32_t save_iso14a_timeout = iso14a_timeout;
+			uint32_t save_iso14a_timeout = iso14a_get_timeout();
 			// temporarily increase timeout
-			iso14a_timeout = MAX((data_bytes[1] & 0x3f) * iso14a_timeout, MAX_ISO14A_TIMEOUT);
+			iso14a_set_timeout(MAX((data_bytes[1] & 0x3f) * save_iso14a_timeout, MAX_ISO14A_TIMEOUT));
 			// Transmit WTX back 
 			// byte1 - WTXM [1..59]. command FWT=FWT*WTXM
 			data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b
@@ -1969,7 +1970,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
 			len = ReaderReceive(data, parity);
 			data_bytes = data;
 			// restore timeout
-			iso14a_timeout = save_iso14a_timeout;
+			iso14a_set_timeout(save_iso14a_timeout);
 		}
 
 		// if we received an I- or R(ACK)-Block with a block number equal to the
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 00fd638c..fcfd7e8f 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -694,10 +694,9 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 			continue;
 		}
 
-		// send a dummy byte as reader response in order to trigger the cards authentication timeout
-		uint8_t dummy_answer = 0;
-		ReaderTransmit(&dummy_answer, 1, NULL);
-		timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;
+		// send a dummy response in order to trigger the cards authentication failure timeout
+		uint8_t dummy_answer[8] = {0};
+		ReaderTransmit(dummy_answer, 8, NULL);
 
 		num_nonces++;
 		if (num_nonces % 2) {
@@ -710,9 +709,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 			i += 9;
 		}
 
-		// wait for the card to become ready again
-		while(GetCountSspClk() < timeout);
-
 	}
 
 	LED_C_OFF();