X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f53020e729d583f7975095ca7b4b467741d99edb..91d62a18fb74387dfe99b57c83bfd737cc871193:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 8d6afadd..33197cf5 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -136,8 +136,8 @@ int CmdHF14AList(const char *Cmd)
 int CmdHF14AReader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+	clearCommandBuffer();
 	SendCommand(&c);
-
 	UsbCommand resp;
 	WaitForResponse(CMD_ACK,&resp);
 	
@@ -185,6 +185,7 @@ int CmdHF14AReader(const char *Cmd)
 			c.arg[1] = 0;
 			c.arg[2] = 0;
 
+			clearCommandBuffer();
 			SendCommand(&c);
 
 			UsbCommand resp;
@@ -248,6 +249,7 @@ int CmdHF14AReader(const char *Cmd)
 		c.arg[1] = 2;
 		c.arg[2] = 0;
 		memcpy(c.d.asBytes, rats, 2);
+		clearCommandBuffer();
 		SendCommand(&c);
 		WaitForResponse(CMD_ACK,&resp);
 		
@@ -345,16 +347,16 @@ int CmdHF14AReader(const char *Cmd)
 						PrintAndLog("                     x0 -> <1 kByte");
 						break;
 					case 0x01:
-						PrintAndLog("                     x0 -> 1 kByte");
+						PrintAndLog("                     x1 -> 1 kByte");
 						break;
 					case 0x02:
-						PrintAndLog("                     x0 -> 2 kByte");
+						PrintAndLog("                     x2 -> 2 kByte");
 						break;
 					case 0x03:
-						PrintAndLog("                     x0 -> 4 kByte");
+						PrintAndLog("                     x3 -> 4 kByte");
 						break;
 					case 0x04:
-						PrintAndLog("                     x0 -> 8 kByte");
+						PrintAndLog("                     x4 -> 8 kByte");
 						break;
 				}
 				switch (card.ats[pos + 3] & 0xf0) {
@@ -395,14 +397,17 @@ int CmdHF14AReader(const char *Cmd)
 
 	
 	// try to see if card responses to "chinese magic backdoor" commands.
+	uint8_t isOK = 0;
+	clearCommandBuffer();
 	c.cmd = CMD_MIFARE_CIDENT;
 	c.arg[0] = 0;
 	c.arg[1] = 0;
 	c.arg[2] = 0;	
 	SendCommand(&c);
-	WaitForResponse(CMD_ACK,&resp);
-	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
+		isOK  = resp.arg[0] & 0xff;
+
+	PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
 	
 	// disconnect
 	c.cmd = CMD_READER_ISO_14443a;
@@ -549,6 +554,7 @@ int CmdHF14ASim(const char *Cmd)
 				int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
 				memcpy(data, resp.d.asBytes, len);
 				tryMfk32(uid, data, key);
+				tryMfk32_moebius(uid, data, key);
 				//tryMfk64(uid, data, key);
 				PrintAndLog("--");
 			}
@@ -601,7 +607,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 	uint32_t temp;
 
     if (strlen(cmd)<2) {
-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
+        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
         PrintAndLog("       -r    do not read response");
         PrintAndLog("       -c    calculate and append CRC");
         PrintAndLog("       -p    leave the signal field ON after receive");
@@ -726,6 +732,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
     c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
     memcpy(c.d.asBytes,data,datalen);
 
+	clearCommandBuffer();
     SendCommand(&c);
 
     if (reply) {