added `hf 14a apdu` command.

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index db9ce46e4b65bea1544dfbe8a1a3b54e71e7329b..91fcdeb1c5b32558084669a382be3d1537abc237 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -405,27 +405,8 @@ int CmdHF14AReader(const char *Cmd)
 
        
        // try to see if card responses to "chinese magic backdoor" commands.
-       c.cmd = CMD_MIFARE_CIDENT;
-       c.arg[0] = 0;
-       c.arg[1] = 0;
-       c.arg[2] = 0;   
-       SendCommand(&c);
-       WaitForResponse(CMD_ACK,&resp);
-       
-       uint8_t isGeneration = resp.arg[0] & 0xff;
-       switch( isGeneration ){
-               case 1: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1a): YES"); break;
-               case 2: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1b): YES"); break;
-               default: PrintAndLog("Answers to chinese magic backdoor commands: NO"); break;
-       }
+       mfCIdentify();
        
-       // disconnect
-       c.cmd = CMD_READER_ISO_14443a;
-       c.arg[0] = 0;
-       c.arg[1] = 0;
-       c.arg[2] = 0;
-       SendCommand(&c);
-
        return select_status;
 }
 
@@ -573,6 +554,19 @@ int CmdHF14ASnoop(const char *Cmd) {
        return 0;
 }
 
+int CmdHF14AAPDU(const char *cmd) {
+       if (strlen(cmd)<2) {
+               PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");
+               PrintAndLog("       -s    activate field and select card");
+               PrintAndLog("       -k    leave the signal field ON after receive response");
+               PrintAndLog("       -t    executes TLV decoder if it possible");
+               return 0;
+       }
+       
+       
+       
+       return 0;
+}
 
 int CmdHF14ACmdRaw(const char *cmd) {
        UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
@@ -778,6 +772,7 @@ static command_t CommandTable[] =
   {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
   {"sim",    CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443a tag"},
   {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
+  {"apdu",   CmdHF14AAPDU,         0, "Send ISO 1443-4 APDU to tag"},
   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
 };