X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/902cb3c00b49535f0de9a3b6d5ba0c54260ccac1..125a98a1102cc27cefeba77f6d37542c1c475c52:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index a82c7e35..78c269cb 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -16,7 +16,7 @@
 #include "util.h"
 #include "iso14443crc.h"
 #include "data.h"
-#include "proxusb.h"
+//#include "proxusb.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
@@ -168,8 +168,7 @@ int CmdHF14AReader(const char *Cmd)
 	UsbCommand resp;
   WaitForResponse(CMD_ACK,&resp);
 	
-  uint8_t              * uid  = resp.d.asBytes;
-	iso14a_card_select_t * card = (iso14a_card_select_t *)(uid + 12);
+	iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;
 
 	if(resp.arg[0] == 0) {
 		PrintAndLog("iso14443a card select failed");
@@ -177,24 +176,24 @@ int CmdHF14AReader(const char *Cmd)
 	}
 
 	PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
-	PrintAndLog(" UID : %s", sprint_hex(uid, 12));
+	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) {
@@ -314,9 +313,9 @@ 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];
 }
@@ -392,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;