X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/534983d7352171526a6d43b112e0baaefdb1e3cd..ab8b654efa9524b494014efd35ac426aaa42884b:/client/cmdhf14a.c?ds=sidebyside

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 145f6a67..2a8c1f87 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1,4 +1,5 @@
 //-----------------------------------------------------------------------------
+// 2011, Merlok
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
@@ -11,6 +12,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include "util.h"
 #include "iso14443crc.h"
 #include "data.h"
 #include "proxusb.h"
@@ -18,6 +21,7 @@
 #include "cmdparser.h"
 #include "cmdhf14a.h"
 #include "common.h"
+#include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -145,7 +149,7 @@ int CmdHF14AList(const char *Cmd)
     prev = timestamp;
     i += (len + 9);
   }
-  return 0;
+	return 0;
 }
 
 void iso14a_set_timeout(uint32_t timeout) {
@@ -153,20 +157,13 @@ void iso14a_set_timeout(uint32_t timeout) {
 	SendCommand(&c);
 }
 
-int CmdHF14AMifare(const char *Cmd)
-{
-  UsbCommand c = {CMD_READER_MIFARE, {strtol(Cmd, NULL, 0), 0, 0}};
-  SendCommand(&c);
-  return 0;
-}
-
 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 = uid + 12;
+	iso14a_card_select_t * card = (iso14a_card_select_t *)(uid + 12);
 
 	if(resp->arg[0] == 0) {
 		PrintAndLog("iso14443a card select failed");
@@ -176,6 +173,18 @@ int CmdHF14AReader(const char *Cmd)
 	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]);
+	switch (card->sak) {
+		case  0: PrintAndLog(" SAK : MIFARE ultralight?"); break;
+		case  8: PrintAndLog(" SAK : MIFARE CLASSIC 1K"); break;
+		case  9: PrintAndLog(" SAK : MIFARE MINI"); break;
+		case 18: PrintAndLog(" SAK : MIFARE CLASSIC 4K"); break;
+		case 20: PrintAndLog(" SAK : MIFARE DESFIRE or JCOP 31/41"); break;
+		case 28: PrintAndLog(" SAK : JCOP31 or JCOP41 v2.3.1"); break;
+		case 38: PrintAndLog(" SAK : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
+		case 88: PrintAndLog(" SAK : Infineon MIFARE CLASSIC 1K"); break;
+		case 98: PrintAndLog(" SAK : Gemplus MPCOS"); break;
+		default: ;
+	}
 	if(resp->arg[0] == 1)
 		PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
 	else
@@ -212,17 +221,20 @@ int CmdHF14ASnoop(const char *Cmd)
 
 static command_t CommandTable[] = 
 {
-  {"help",    CmdHelp,        1, "This help"},
-  {"list",    CmdHF14AList,   0, "List ISO 14443a history"},
-  {"mifare",  CmdHF14AMifare, 0, "Read out sector 0 parity error messages"},
-  {"reader",  CmdHF14AReader, 0, "Act like an ISO14443 Type A reader"},
-  {"sim",     CmdHF14ASim,    0, "<UID> -- Fake ISO 14443a tag"},
-  {"snoop",   CmdHF14ASnoop,  0, "Eavesdrop ISO 14443 Type A"},
+  {"help",   CmdHelp,          1, "This help"},
+  {"list",   CmdHF14AList,     0, "List ISO 14443a history"},
+  {"reader", CmdHF14AReader,   0, "Act like an ISO14443 Type A reader"},
+  {"sim",    CmdHF14ASim,      0, "<UID> -- Fake ISO 14443a tag"},
+  {"snoop",  CmdHF14ASnoop,    0, "Eavesdrop ISO 14443 Type A"},
   {NULL, NULL, 0, NULL}
 };
 
 int CmdHF14A(const char *Cmd)
 {
+	// flush
+	while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;
+
+	// parse
   CmdsParse(CommandTable, Cmd);
   return 0;
 }