X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/46cd801c5ad5d5f60b2526b4a1e6700a2a008f7b..a71c68bdf0d117609a1ffd0141d1d682e1ff8e15:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 8f53bebe..8a6e6afd 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -464,6 +464,7 @@ static int usage_hf_14a_sim(void)
 	PrintAndLog("            4 = ISO/IEC 14443-4");
 	PrintAndLog("            5 = MIFARE Tnp3xxx");
 	PrintAndLog("            6 = MIFARE Mini");
+	PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
 	PrintAndLog("    u     : 4 or 7 byte UID");
 	PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
 	PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
@@ -481,6 +482,8 @@ int CmdHF14ASim(const char *Cmd)
 	uint64_t uid = 0;
 	uint8_t cmdp = 0;
 	
+	clearCommandBuffer();
+	
 	while(param_getchar(Cmd, cmdp) != 0x00)
 	{
 		switch(param_getchar(Cmd, cmdp))
@@ -537,19 +540,19 @@ int CmdHF14ASim(const char *Cmd)
 
 	uint8_t data[40];
 	uint8_t key[6];
-
+	UsbCommand resp;
 	while(!ukbhit()){
-		UsbCommand resp;
-		WaitForResponseTimeout(CMD_ACK,&resp,1500);
-		PrintAndLog("CMD_SIMULATE_MIFARE_CARD [%04X] -- %04X", CMD_SIMULATE_MIFARE_CARD, resp.arg[0]);
-		if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
-			memset(data, 0x00, sizeof(data));
-			memset(key, 0x00, sizeof(key));
-			int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
-			memcpy(data, resp.d.asBytes, len);
-			tryMfk32(uid, data, key);
-			//tryMfk64(uid, data, key);
-			PrintAndLog("--");
+		if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+			if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
+				memset(data, 0x00, sizeof(data));
+				memset(key, 0x00, sizeof(key));
+				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("--");
+			}
 		}
 	}
 	return 0;
@@ -724,6 +727,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
     c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
     memcpy(c.d.asBytes,data,datalen);
 
+	clearCommandBuffer();
     SendCommand(&c);
 
     if (reply) {