From: Martin Holst Swende <martin@swende.se>
Date: Sun, 14 Dec 2014 17:07:38 +0000 (+0100)
Subject: Merge branch 'master' of github.com:Proxmark/proxmark3
X-Git-Tag: v2.0.0-rc1~84^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b16043234058bd61d5b87952ab616105a1df21f6?hp=f4bad97d92bf72dbb76f13c7fb7d2268129e01c3

Merge branch 'master' of github.com:Proxmark/proxmark3
---

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 0ee1b355..73036712 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -994,7 +994,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 	{
 
 		uint8_t mac_responses[64] = { 0 };
-		Dbprintf("Going into attack mode");
+		Dbprintf("Going into attack mode, %d CSNS sent", numberOfCSNS);
 		// In this mode, a number of csns are within datain. We'll simulate each one, one at a time
 		// in order to collect MAC's from the reader. This can later be used in an offlne-attack
 		// in order to obtain the keys, as in the "dismantling iclass"-paper.
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index d9af9044..a59a9bac 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -340,7 +340,7 @@ int CmdHFiClassSim(const char *Cmd)
 
 	if(simType == 2)
 	{
-		UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,63}};
+		UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,8}};
 		UsbCommand resp = {0};
 
 		uint8_t csns[64] = {