]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway...
[proxmark3-svn] / client / cmdhf14a.c
index 3dc501d479f6baa9314e3765afa1f3a253d2a759..94c3ad2c6cbea53acb3fd5782ec43b8c40905486 100644 (file)
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "util.h"
+#include "util_posix.h"
 #include "iso14443crc.h"
 #include "data.h"
 #include "proxmark3.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
+#include "mifarehost.h"
 
 static int CmdHelp(const char *Cmd);
-static void waitCmd(uint8_t iLen);
+static int waitCmd(uint8_t iLen);
 
 // structure and database for uid -> tagtype lookups 
 typedef struct { 
@@ -403,22 +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 isOK  = resp.arg[0] & 0xff;
-       PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+       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;
 }
 
@@ -431,11 +419,11 @@ int CmdHF14ACUIDs(const char *Cmd)
        n = n > 0 ? n : 1;
 
        PrintAndLog("Collecting %d UIDs", n);
-       PrintAndLog("Start: %u", time(NULL));
+       PrintAndLog("Start: %" PRIu64, msclock()/1000);
        // repeat n times
        for (int i = 0; i < n; i++) {
                // execute anticollision procedure
-               UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+               UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
                SendCommand(&c);
     
                UsbCommand resp;
@@ -454,7 +442,7 @@ int CmdHF14ACUIDs(const char *Cmd)
                        PrintAndLog("%s", uid_string);
                }
        }
-       PrintAndLog("End: %u", time(NULL));
+       PrintAndLog("End: %" PRIu64, msclock()/1000);
 
        return 1;
 }
@@ -561,72 +549,206 @@ int CmdHF14ASnoop(const char *Cmd) {
                if (ctmp == 'r' || ctmp == 'R') param |= 0x02;
        }
 
-  UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
-  SendCommand(&c);
-  return 0;
+       UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
+       SendCommand(&c);
+       return 0;
 }
 
+int CmdHF14AAPDU(const char *cmd) {
+       uint8_t data[USB_CMD_DATA_SIZE];
+       uint16_t datalen = 0;
+       uint8_t cmdc = 0;
+       char buf[5] = {0};
+       int i = 0;
+       uint32_t temp;
+       bool activateField = false;
+       bool leaveSignalON = false;
+       bool decodeTLV = false;
+       
+       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;
+       }
+
+       // strip
+       while (*cmd==' ' || *cmd=='\t') cmd++;
+
+       while (cmd[i]!='\0') {
+               if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
+               if (cmd[i]=='-') {
+                       switch (cmd[i + 1]) {
+                               case 's':
+                               case 'S':
+                                       activateField = true;
+                                       break;
+                               case 'k':
+                               case 'K':
+                                       leaveSignalON = true;
+                                       break;
+                               case 't':
+                               case 'T':
+                                       decodeTLV = true;
+                                       break;
+                               default:
+                                       PrintAndLog("Invalid option");
+                                       return 1;
+                       }
+                       i += 2;
+                       continue;
+               }
+               if ((cmd[i] >= '0' && cmd[i] <= '9') ||
+                   (cmd[i] >= 'a' && cmd[i] <= 'f') ||
+                   (cmd[i] >= 'A' && cmd[i] <= 'F') ) {
+                       buf[strlen(buf) + 1] = 0x00;
+                       buf[strlen(buf)] = cmd[i];
+                       i++;
+
+                       if (strlen(buf) >= 2) {
+                               sscanf(buf, "%x", &temp);
+                               data[datalen] = (uint8_t)(temp & 0xff);
+                               *buf = 0;
+                               if (datalen > sizeof(data) - 2) {
+                                       PrintAndLog("Buffer is full...");
+                                       break;
+                               } else {
+                                       datalen++;
+                               }
+                       }
+                       continue;
+               }
+               PrintAndLog("Invalid char on input");
+               return 1;
+       }
+       if (*buf) {
+               PrintAndLog("Hex must have even number of digits. Detected %d symbols.", datalen * 2 + strlen(buf));
+               return 1;
+       }               
+       
+       PrintAndLog("--%s %s %s >>>> %s", activateField ? "sel": "", leaveSignalON ? "keep": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
+
+       if (activateField)
+               cmdc |= ISO14A_CONNECT;
+       if (leaveSignalON)
+               cmdc |= ISO14A_NO_DISCONNECT;
+       
+       // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
+       // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
+       // here length USB_CMD_DATA_SIZE=512
+       // timeout timeout14a * 1.06 / 100, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_SET_TIMEOUT | cmdc, (datalen & 0xFFFF), 1000 * 1000 * 1.06 / 100}}; 
+
+//     uint8_t first, second;
+//     ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
+//     data[datalen++] = first;
+//     data[datalen++] = second;
+
+       memcpy(c.d.asBytes, data, datalen);
+
+       SendCommand(&c);
+       
+    uint8_t *recv;
+    char *hexout;
+    UsbCommand resp;
+
+       if (activateField) {
+               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) 
+                       return 2;
+               if (resp.arg[0] != 1)
+                       return 2;
+       }
+
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        recv = resp.d.asBytes;
+        uint8_t iLen = resp.arg[0];
+        if(!iLen)
+            return 2;
+        hexout = (char *)malloc(iLen * 3 + 1);
+        if (hexout != NULL) {
+            for (int i = 0; i < iLen; i++) { // data in hex
+                sprintf(&hexout[i * 3], "%02X ", recv[i]);
+            }
+            PrintAndLog("<<<< %s", hexout);
+                       
+                       // here TLV decoder...
+                       
+            free(hexout);
+        } else {
+            PrintAndLog("malloc failed...");
+                       return 2;
+        }
+    } else {
+        PrintAndLog("Reply timeout.");
+               return 3;
+    }
+       
+       return 0;
+}
 
 int CmdHF14ACmdRaw(const char *cmd) {
-    UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
-    bool reply=1;
-    bool crc = false;
-    bool power = false;
-    bool active = false;
-    bool active_select = false;
-    uint16_t numbits = 0;
+       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
+       bool reply=1;
+       bool crc = false;
+       bool power = false;
+       bool active = false;
+       bool active_select = false;
+       bool no_rats = false;
+       uint16_t numbits = 0;
        bool bTimeout = false;
        uint32_t timeout = 0;
        bool topazmode = false;
-    char buf[5]="";
-    int i = 0;
-    uint8_t data[USB_CMD_DATA_SIZE];
+       char buf[5]="";
+       int i = 0;
+       uint8_t data[USB_CMD_DATA_SIZE];
        uint16_t datalen = 0;
        uint32_t temp;
 
-    if (strlen(cmd)<2) {
-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
-        PrintAndLog("       -r    do not read response");
-        PrintAndLog("       -c    calculate and append CRC");
-        PrintAndLog("       -p    leave the signal field ON after receive");
-        PrintAndLog("       -a    active signal field ON without select");
-        PrintAndLog("       -s    active signal field ON with select");
-        PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
+       if (strlen(cmd)<2) {
+               PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
+               PrintAndLog("       -r    do not read response");
+               PrintAndLog("       -c    calculate and append CRC");
+               PrintAndLog("       -p    leave the signal field ON after receive");
+               PrintAndLog("       -a    active signal field ON without select");
+               PrintAndLog("       -s    active signal field ON with select");
+               PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
                PrintAndLog("       -t    timeout in ms");
                PrintAndLog("       -T    use Topaz protocol to send command");
-        return 0;
-    }
+               PrintAndLog("       -3    ISO14443-3 select only (skip RATS)");
+               return 0;
+       }
 
-       
-    // strip
-    while (*cmd==' ' || *cmd=='\t') cmd++;
-
-    while (cmd[i]!='\0') {
-        if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
-        if (cmd[i]=='-') {
-            switch (cmd[i+1]) {
-                case 'r': 
-                    reply = false;
-                    break;
-                case 'c':
-                    crc = true;
-                    break;
-                case 'p':
-                    power = true;
-                    break;
-                case 'a':
-                    active = true;
-                    break;
-                case 's':
-                    active_select = true;
-                    break;
-                case 'b': 
-                    sscanf(cmd+i+2,"%d",&temp);
-                    numbits = temp & 0xFFFF;
-                    i+=3;
-                    while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
-                    i-=2;
-                    break;
+
+       // strip
+       while (*cmd==' ' || *cmd=='\t') cmd++;
+
+       while (cmd[i]!='\0') {
+               if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
+               if (cmd[i]=='-') {
+                       switch (cmd[i+1]) {
+                               case 'r': 
+                                       reply = false;
+                                       break;
+                               case 'c':
+                                       crc = true;
+                                       break;
+                               case 'p':
+                                       power = true;
+                                       break;
+                               case 'a':
+                                       active = true;
+                                       break;
+                               case 's':
+                                       active_select = true;
+                                       break;
+                               case 'b': 
+                                       sscanf(cmd+i+2,"%d",&temp);
+                                       numbits = temp & 0xFFFF;
+                                       i+=3;
+                                       while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
+                                       i-=2;
+                                       break;
                                case 't':
                                        bTimeout = true;
                                        sscanf(cmd+i+2,"%d",&temp);
@@ -635,98 +757,107 @@ int CmdHF14ACmdRaw(const char *cmd) {
                                        while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
                                        i-=2;
                                        break;
-                case 'T':
+                               case 'T':
                                        topazmode = true;
                                        break;
-                default:
-                    PrintAndLog("Invalid option");
-                    return 0;
-            }
-            i+=2;
-            continue;
-        }
-        if ((cmd[i]>='0' && cmd[i]<='9') ||
-            (cmd[i]>='a' && cmd[i]<='f') ||
-            (cmd[i]>='A' && cmd[i]<='F') ) {
-            buf[strlen(buf)+1]=0;
-            buf[strlen(buf)]=cmd[i];
-            i++;
-
-            if (strlen(buf)>=2) {
-                sscanf(buf,"%x",&temp);
-                data[datalen]=(uint8_t)(temp & 0xff);
-                *buf=0;
-                               if (++datalen>sizeof(data)){
+                               case '3':
+                                       no_rats = true;
+                                       break;
+                               default:
+                                       PrintAndLog("Invalid option");
+                                       return 0;
+                       }
+                       i+=2;
+                       continue;
+               }
+               if ((cmd[i]>='0' && cmd[i]<='9') ||
+                   (cmd[i]>='a' && cmd[i]<='f') ||
+                   (cmd[i]>='A' && cmd[i]<='F') ) {
+                       buf[strlen(buf)+1]=0;
+                       buf[strlen(buf)]=cmd[i];
+                       i++;
+
+                       if (strlen(buf)>=2) {
+                               sscanf(buf,"%x",&temp);
+                               data[datalen]=(uint8_t)(temp & 0xff);
+                               *buf=0;
+                               if (datalen > sizeof(data)-1) {
                                        if (crc)
                                                PrintAndLog("Buffer is full, we can't add CRC to your data");
                                        break;
+                               } else {
+                                       datalen++;
                                }
-            }
-            continue;
-        }
-        PrintAndLog("Invalid char on input");
-        return 0;
-    }
+                       }
+                       continue;
+               }
+               PrintAndLog("Invalid char on input");
+               return 0;
+       }
 
-    if(crc && datalen>0 && datalen<sizeof(data)-2)
-    {
-        uint8_t first, second;
+       if(crc && datalen>0 && datalen<sizeof(data)-2)
+       {
+               uint8_t first, second;
                if (topazmode) {
                        ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
                } else {
                        ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
                }
-        data[datalen++] = first;
-        data[datalen++] = second;
-    }
+               data[datalen++] = first;
+               data[datalen++] = second;
+       }
 
-    if(active || active_select)
-    {
-        c.arg[0] |= ISO14A_CONNECT;
-        if(active)
-            c.arg[0] |= ISO14A_NO_SELECT;
-    }
+       if(active || active_select)
+       {
+               c.arg[0] |= ISO14A_CONNECT;
+               if(active)
+                       c.arg[0] |= ISO14A_NO_SELECT;
+       }
 
        if(bTimeout){
-           #define MAX_TIMEOUT 40542464        // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
-        c.arg[0] |= ISO14A_SET_TIMEOUT;
-        if(timeout > MAX_TIMEOUT) {
-            timeout = MAX_TIMEOUT;
-            PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
-        }
+               #define MAX_TIMEOUT 40542464    // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
+               c.arg[0] |= ISO14A_SET_TIMEOUT;
+               if(timeout > MAX_TIMEOUT) {
+                       timeout = MAX_TIMEOUT;
+                       PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
+               }
                c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
        }
 
-    if(power) {
-        c.arg[0] |= ISO14A_NO_DISCONNECT;
-    }
+       if(power) {
+               c.arg[0] |= ISO14A_NO_DISCONNECT;
+       }
 
        if(datalen > 0) {
-        c.arg[0] |= ISO14A_RAW;
-    }
+               c.arg[0] |= ISO14A_RAW;
+       }
 
        if(topazmode) {
                c.arg[0] |= ISO14A_TOPAZMODE;
-    }
-               
-       // Max buffer is USB_CMD_DATA_SIZE
-    c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
-    memcpy(c.d.asBytes,data,datalen);
-
-    SendCommand(&c);
-
-    if (reply) {
-        if(active_select)
-            waitCmd(1);
-        if(datalen>0)
-            waitCmd(0);
-    } // if reply
-    return 0;
+       }
+
+       if(no_rats) {
+               c.arg[0] |= ISO14A_NO_RATS;
+       }
+
+       // Max buffer is USB_CMD_DATA_SIZE (512)
+       c.arg[1] = (datalen & 0xFFFF) | ((uint32_t)numbits << 16);
+       memcpy(c.d.asBytes,data,datalen);
+
+       SendCommand(&c);
+
+       if (reply) {
+               int res = 0;
+               if (active_select)
+                       res = waitCmd(1);
+               if (!res && datalen > 0)
+                       waitCmd(0);
+       } // if reply
+       return 0;
 }
 
 
-static void waitCmd(uint8_t iSelect)
-{
+static int waitCmd(uint8_t iSelect) {
     uint8_t *recv;
     UsbCommand resp;
     char *hexout;
@@ -736,7 +867,7 @@ static void waitCmd(uint8_t iSelect)
         uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
         PrintAndLog("received %i octets", iLen);
         if(!iLen)
-            return;
+            return 1;
         hexout = (char *)malloc(iLen * 3 + 1);
         if (hexout != NULL) {
             for (int i = 0; i < iLen; i++) { // data in hex
@@ -746,10 +877,13 @@ static void waitCmd(uint8_t iSelect)
             free(hexout);
         } else {
             PrintAndLog("malloc failed your client has low memory?");
+                       return 2;
         }
     } else {
         PrintAndLog("timeout while waiting for reply.");
+               return 3;
     }
+       return 0;
 }
 
 static command_t CommandTable[] = 
@@ -760,6 +894,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}
 };
Impressum, Datenschutz