From bfaecce6ebf50e296a1a4d221411581ff96f91c3 Mon Sep 17 00:00:00 2001
From: "Merlokbr@gmail.com"
 <Merlokbr@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Thu, 8 Nov 2012 09:48:02 +0000
Subject: [PATCH] there was bug in `hf mf mifare`. and speed up this command.

---
 armsrc/iso14443a.c           |  7 ++++---
 client/cmdhfmf.c             | 17 +++++++++++------
 client/nonce2key/nonce2key.c | 16 ++++++++++++----
 client/nonce2key/nonce2key.h |  1 +
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index af7b3545..d2a54d8c 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1850,11 +1850,12 @@ void ReaderMifare(uint32_t parameter)
 
 	while(TRUE)
 	{
-		LED_C_ON();
+		LED_C_OFF();
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-		SpinDelay(200);
+		SpinDelay(10);
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-		LED_C_OFF();
+		LED_C_ON();
+		SpinDelay(2);
 
 		// Test if the action was cancelled
 		if(BUTTON_PRESS()) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index f3f243c4..dff5db37 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -71,17 +71,22 @@ start:
 	if (isOK != 1) return 1;
 	
 	// execute original function from util nonce2key
-	if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2;
-	printf("------------------------------------------------------------------\n");
-	PrintAndLog("Key found:%012llx \n", r_key);
+	if (nonce2key(uid, nt, par_list, ks_list, &r_key))
+	{
+		isOK = 2;
+		PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);	
+	} else {
+		printf("------------------------------------------------------------------\n");
+		PrintAndLog("Key found:%012llx \n", r_key);
 
-	num_to_bytes(r_key, 6, keyBlock);
-	isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
+		num_to_bytes(r_key, 6, keyBlock);
+		isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
+	}
 	if (!isOK) 
 		PrintAndLog("Found valid key:%012llx", r_key);
 	else
 	{
-		PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);	
+		if (isOK != 2) PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);	
 		c.arg[0] = nt;
 		goto start;
 	}
diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 1c7ee14c..032b15c4 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -14,7 +14,7 @@
 #include "ui.h"
 
 int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
-  struct Crypto1State *state;
+  struct Crypto1State *state, *state_s;
   uint32_t pos, nr, rr, nr_diff;//, ks1, ks2;
   byte_t bt, i, ks3x[8], par[8][8];
   uint64_t key_recovered;
@@ -47,9 +47,17 @@ int nonce2key(uint32_t uid, uint32_t nt, uint64_t par_info, uint64_t ks_info, ui
   }
   
   state = lfsr_common_prefix(nr, rr, ks3x, par);
-  lfsr_rollback_word(state, uid^nt, 0);
-  crypto1_get_lfsr(state, &key_recovered);
-  crypto1_destroy(state);
+	state_s = 0;
+	for (i = 0; (state) && ((state + i)->odd != 0 || (state + i)->even != 0) && (i < 10); i++)
+	{
+    printf("%08x|%08x\n",(state+i)->odd, (state+i)->even);
+		state_s = state + i;
+	}
+  if (!state_s) return 1;
+	
+  lfsr_rollback_word(state_s, uid^nt, 0);
+  crypto1_get_lfsr(state_s, &key_recovered);
+  if (!state) free(state);
 	
 	*key = key_recovered;
   
diff --git a/client/nonce2key/nonce2key.h b/client/nonce2key/nonce2key.h
index 0f577cf8..acde7c88 100644
--- a/client/nonce2key/nonce2key.h
+++ b/client/nonce2key/nonce2key.h
@@ -15,6 +15,7 @@
 
 #include <inttypes.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "crapto1.h"
 #include "common.h"
 
-- 
2.39.2