From: Iceman <iceman@iuse.se>
Date: Tue, 6 Feb 2018 07:15:03 +0000 (+0100)
Subject: Merge pull request #560 from pwpiwi/fix_hfmfmif
X-Git-Tag: v3.1.0~75
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/2ef3a5e99c8b27b06f860988783e1040a6dea705?hp=c839fa2c259e79f920ae7cd7fca5fe0be382da32

Merge pull request #560 from pwpiwi/fix_hfmfmif

fix: prevent hf mf mifare from always running twice
---

diff --git a/client/mifarehost.c b/client/mifarehost.c
index dd656ee1..a01d3b5f 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -178,12 +178,14 @@ int mfDarkside(uint64_t *key)
 			continue;
 		}
 
-		qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
-		keycount = intersection(last_keylist, keylist);
-		if (keycount == 0) {
-			free(last_keylist);
-			last_keylist = keylist;
-			continue;
+		if (par_list == 0) {
+			qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
+			keycount = intersection(last_keylist, keylist);
+			if (keycount == 0) {
+				free(last_keylist);
+				last_keylist = keylist;
+				continue;
+			}
 		}
 
 		if (keycount > 1) {
@@ -198,10 +200,10 @@ int mfDarkside(uint64_t *key)
 		for (int i = 0; i < keycount; i += max_keys) {
 			int size = keycount - i > max_keys ? max_keys : keycount - i;
 			for (int j = 0; j < size; j++) {
-				if (last_keylist == NULL) {
-					num_to_bytes(keylist[i*max_keys + j], 6, keyBlock);
-				} else {
+				if (par_list == 0) {
 					num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock);
+				} else {
+					num_to_bytes(keylist[i*max_keys + j], 6, keyBlock);
 				}
 			}
 			if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) {