X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4401050bcc877a9f1137dc6241f0895d0ca09d98..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/client/cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index f4f40fc3..21c97fa2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // 2011, Merlok
+// 2014, Peter Fillmore
 // 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,
@@ -107,6 +108,7 @@ const manufactureName manufactureMapping[] = {
 	{ 0x42, "3Alogics Inc Korea" },
 	{ 0x43, "Top TroniQ Asia Limited Hong Kong" },
 	{ 0x44, "Gentag Inc. USA" },
+	{ 0x56, "Sensible Object. UK" },
 	{ 0x00, "no tag-info available" } // must be the last entry
 };
 
@@ -221,6 +223,8 @@ int CmdHF14AReader(const char *Cmd) {
 			uint32_t tagT = GetHF14AMfU_Type();
 			if (tagT != UL_ERROR)
 				ul_print_type(tagT, 0);
+			else 
+				PrintAndLog("TYPE: Possible AZTEK (iso14443a compliant)");
 
 			// reconnect for further tests
 			c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
@@ -386,7 +390,7 @@ int CmdHF14AReader(const char *Cmd) {
 
 	
 	// try to see if card responses to "chinese magic backdoor" commands.
-	uint8_t isOK = 0;
+	uint8_t isGeneration = 0;
 	clearCommandBuffer();
 	c.cmd = CMD_MIFARE_CIDENT;
 	c.arg[0] = 0;
@@ -394,13 +398,17 @@ int CmdHF14AReader(const char *Cmd) {
 	c.arg[2] = 0;	
 	SendCommand(&c);
 	if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-		isOK  = resp.arg[0] & 0xff;
-
-	PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
+		isGeneration = resp.arg[0] & 0xff;
 	
+	switch( isGeneration ){
+		case 1: PrintAndLog("Answers to magic commands (GEN 1a): YES"); break;
+		case 2: PrintAndLog("Answers to magic commands (GEN 1b): YES"); break;
+		//case 4: PrintAndLog("Answers to magic commands (GEN 2): YES"); break;
+		default: PrintAndLog("Answers to magic commands: NO"); break;
+	}		
+
 	// disconnect
 	SendCommand(&cDisconnect);
-
 	return select_status;
 }
 
@@ -698,7 +706,8 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
-static void waitCmd(uint8_t iSelect) {
+static void waitCmd(uint8_t iSelect)
+{
     UsbCommand resp;
     uint16_t len = 0;