X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5acd09bdfb9b3777585f3875190e942e259a98f0..0beed8fc67c20ba60952d627b7bdbebc0a1655b8:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 4b405d2b..78c269cb 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -16,19 +16,22 @@
 #include "util.h"
 #include "iso14443crc.h"
 #include "data.h"
-#include "proxusb.h"
+//#include "proxusb.h"
+#include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14a.h"
 #include "common.h"
 #include "cmdmain.h"
+#include "mifare.h"
 
 static int CmdHelp(const char *Cmd);
 
 int CmdHF14AList(const char *Cmd)
 {
   uint8_t got[1920];
-  GetFromBigBuf(got, sizeof(got));
+  GetFromBigBuf(got,sizeof(got),0);
+  WaitForResponse(CMD_ACK,NULL);
 
   PrintAndLog("recorded activity:");
   PrintAndLog(" ETU     :rssi: who bytes");
@@ -161,37 +164,39 @@ int CmdHF14AReader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
 	SendCommand(&c);
-	UsbCommand * resp = WaitForResponse(CMD_ACK);
-	uint8_t              * uid  = resp->d.asBytes;
-	iso14a_card_select_t * card = (iso14a_card_select_t *)(uid + 12);
 
-	if(resp->arg[0] == 0) {
+	UsbCommand resp;
+  WaitForResponse(CMD_ACK,&resp);
+	
+	iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;
+
+	if(resp.arg[0] == 0) {
 		PrintAndLog("iso14443a card select failed");
 		return 0;
 	}
 
 	PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
-	PrintAndLog(" UID : %s", sprint_hex(uid, 12));
-	PrintAndLog(" SAK : %02x [%d]", card->sak, resp->arg[0]);
+	PrintAndLog(" UID : %s", sprint_hex(card->uid, card->uidlen));
+	PrintAndLog(" SAK : %02x [%d]", card->sak, resp.arg[0]);
 
 	switch (card->sak) {
-		case 0x00: PrintAndLog(" SAK : NXP MIFARE Ultralight | Ultralight C"); break;
-		case 0x04: PrintAndLog(" SAK : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
-
-		case 0x08: PrintAndLog(" SAK : NXP MIFARE CLASSIC 1k | Plus 2k"); break;
-		case 0x09: PrintAndLog(" SAK : NXP MIFARE Mini 0.3k"); break;
-		case 0x10: PrintAndLog(" SAK : NXP MIFARE Plus 2k"); break;
-		case 0x11: PrintAndLog(" SAK : NXP MIFARE Plus 4k"); break;
-		case 0x18: PrintAndLog(" SAK : NXP MIFARE Classic 4k | Plus 4k"); break;
-		case 0x20: PrintAndLog(" SAK : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k | JCOP 31/41"); break;
-		case 0x24: PrintAndLog(" SAK : NXP MIFARE DESFire | DESFire EV1"); break;
-		case 0x28: PrintAndLog(" SAK : JCOP31 or JCOP41 v2.3.1"); break;
-		case 0x38: PrintAndLog(" SAK : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
-		case 0x88: PrintAndLog(" SAK : Infineon MIFARE CLASSIC 1K"); break;
-		case 0x98: PrintAndLog(" SAK : Gemplus MPCOS"); break;
+		case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
+		case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
+
+		case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k"); break;
+		case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
+		case 0x10: PrintAndLog("TYPE : NXP MIFARE Plus 2k"); break;
+		case 0x11: PrintAndLog("TYPE : NXP MIFARE Plus 4k"); break;
+		case 0x18: PrintAndLog("TYPE : NXP MIFARE Classic 4k | Plus 4k"); break;
+		case 0x20: PrintAndLog("TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k | JCOP 31/41"); break;
+		case 0x24: PrintAndLog("TYPE : NXP MIFARE DESFire | DESFire EV1"); break;
+		case 0x28: PrintAndLog("TYPE : JCOP31 or JCOP41 v2.3.1"); break;
+		case 0x38: PrintAndLog("TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
+		case 0x88: PrintAndLog("TYPE : Infineon MIFARE CLASSIC 1K"); break;
+		case 0x98: PrintAndLog("TYPE : Gemplus MPCOS"); break;
 		default: ;
 	}
-	if(resp->arg[0] == 1) {
+	if(resp.arg[0] == 1) {
 		bool ta1 = 0, tb1 = 0, tc1 = 0;
 		int pos;
 
@@ -308,11 +313,11 @@ int CmdHF14AReader(const char *Cmd)
 				}
 			}
 		}
-	}
-	else
-		PrintAndLog("proprietary non-iso14443a card found, RATS not supported");
+	} else {
+		PrintAndLog("proprietary non iso14443a-4 card found, RATS not supported");
+  }
 
-	return resp->arg[0];
+	return resp.arg[0];
 }
 
 // Collect ISO14443 Type A UIDs
@@ -330,12 +335,15 @@ int CmdHF14ACUIDs(const char *Cmd)
 		// execute anticollision procedure
 		UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
 		SendCommand(&c);
-		UsbCommand *resp = WaitForResponse(CMD_ACK);
-		uint8_t *uid  = resp->d.asBytes;
+    
+    UsbCommand resp;
+    WaitForResponse(CMD_ACK,&resp);
+
+		uint8_t *uid  = resp.d.asBytes;
 		iso14a_card_select_t *card = (iso14a_card_select_t *)(uid + 12);
 
 		// check if command failed
-		if (resp->arg[0] == 0) {
+		if (resp.arg[0] == 0) {
 			PrintAndLog("Card select failed.");
 		} else {
 			// check if UID is 4 bytes
@@ -383,7 +391,7 @@ int CmdHF14ASim(const char *Cmd)
 
 	// Are we handling the (optional) second part uid?
 	if (long_uid > 0xffffffff) {
-		PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014llx)",long_uid);
+		PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014"llx")",long_uid);
 		// Store the second part
 		c.arg[2] = (long_uid & 0xffffffff);
 		long_uid >>= 32;
@@ -472,10 +480,9 @@ static command_t CommandTable[] =
   {NULL, NULL, 0, NULL}
 };
 
-int CmdHF14A(const char *Cmd)
-{
+int CmdHF14A(const char *Cmd) {
 	// flush
-	while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+	WaitForResponseTimeout(CMD_ACK,NULL,100);
 
 	// parse
   CmdsParse(CommandTable, Cmd);