From: roel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Thu, 7 Mar 2013 12:22:12 +0000 (+0000)
Subject: tweaked sim command, added mfkey32
X-Git-Tag: v1.0.0~130^2~1
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/17331e14ee99bebaef8d84fba44a90818bc5c817?hp=9e130475f9d8c727a5d99db54bc6d52b88a13e78

tweaked sim command, added mfkey32
---

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 7c1db14b..8e078140 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1133,7 +1133,7 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
 			respdata = &nack;
 			respsize = sizeof(nack); // 4-bit answer
 		} else if(receivedCmd[0] == 0x50) {	// Received a HALT
-			DbpString("Reader requested we HALT!:");
+//			DbpString("Reader requested we HALT!:");
 			// Do not respond
 			resp = resp1; respLen = 0; order = 0;
 			respdata = NULL;
@@ -1147,16 +1147,19 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd)
 			respdata = response6;
 			respsize = sizeof(response6);
 		} else {
-			// Never seen this command before
-			Dbprintf("Received (len=%d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-			len,
-			receivedCmd[0], receivedCmd[1], receivedCmd[2],
-			receivedCmd[3], receivedCmd[4], receivedCmd[5],
-			receivedCmd[6], receivedCmd[7], receivedCmd[8]);
-			// Do not respond
-			resp = resp1; respLen = 0; order = 0;
-			respdata = NULL;
-			respsize = 0;
+      if (order == 7 && len ==8) {
+        uint32_t nr = bytes_to_num(receivedCmd,4);
+        uint32_t ar = bytes_to_num(receivedCmd+4,4);
+        Dbprintf("Auth attempt {nr}{ar}: %08x %08x",nr,ar);
+      } else {
+        // Never seen this command before
+        Dbprintf("Received unknown command (len=%d):",len);
+        Dbhexdump(len,receivedCmd,false);
+      }
+      // Do not respond
+      resp = resp1; respLen = 0; order = 0;
+      respdata = NULL;
+      respsize = 0;
 		}
 
 		// Count number of wakeups received after a halt
diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index c01d64b9..f4f7eb82 100755
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -5,7 +5,7 @@ LDFLAGS =
 
 OBJS = crapto1.o crypto1.o
 HEADERS = 
-EXES = mfkey
+EXES = mfkey64 mfkey32
 LIBS =
 	
 all: $(OBJS) $(EXES) $(LIBS)
diff --git a/tools/mfkey/example_trace.txt b/tools/mfkey/example_trace.txt
index 16637fb5..f2587fcd 100644
--- a/tools/mfkey/example_trace.txt
+++ b/tools/mfkey/example_trace.txt
@@ -11,5 +11,5 @@
  +   1287:    :     a1  e4  58  ce  6e  ea  41  e0
  +     64:   0: TAG 5c  ad  f4  39
 
-./mfkey 9c599b32 82a4166c a1e458ce 6eea41e0 5cadf439
+./mfkey64 9c599b32 82a4166c a1e458ce 6eea41e0 5cadf439