]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
chg: more keys.
[proxmark3-svn] / client / cmdhf14a.c
index 6d338d0dec25b1712d1dd386c0a14d8af91d33b0..21c97fa24555d23cf2bab13521ea560c20cba863 100644 (file)
@@ -108,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
 };
 
@@ -389,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;
@@ -397,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;
 }
 
Impressum, Datenschutz