ADD: `hf 14a read` - now can detect the newer magic generation 1b. In output 1A...

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 2600d937c75275a8b2a2b26bddce44ff14aac3aa..cb3a67ed38b702ce75546fd25d096435dff3c4b9 100644 (file)
--- 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
 };
 
@@ -388,21 +390,22 @@ 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;
        c.arg[1] = 0;
        c.arg[2] = 0;   
        SendCommand(&c);
-       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
-               isOK  = resp.arg[0] & 0xff;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+               isGeneration = resp.arg[0] & 0xff;
+       }
+       if ( isGeneration )
+               PrintAndLog("Answers to magic commands (GEN %s): YES", ((isGeneration & 0x2 )==2)?"1B":"1A");
 
-       PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
-       
        // disconnect
        SendCommand(&cDisconnect);
-
        return select_status;
 }
 
@@ -700,7 +703,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;