From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Sun, 10 Dec 2017 10:57:15 +0000 (+0100)
Subject: fix: hf mf hardnested failed with new WUPA timing
X-Git-Tag: v3.1.0~107^2~1
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7c7327e7c89c3640c5f23330ea5263829cea8b6f

fix: hf mf hardnested failed with new WUPA timing
* allow additional 2 ssp_frame cycles to detect SOF
* use only respective functions to get/set iso14a_timeout
* remove waiting time in MifareAcquireEncryptedNonces(). This is covered by GetATQA() now.
---

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index a0fe2326..0a9f7c03 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -189,13 +189,13 @@ 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);
+	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 +1955,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 +1969,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();