Update cmdhficlass.h

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c16a64bd59967b033c96e2b1debbda1f0f0f5124..8064724cc3185a66b2e86f0c38c4bb8baaf9646c 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// 2011, Merlok
+// 2011, 2017 Merlok

 // 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,
 // 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,


@@ -9,6 +9,8 @@
 // High frequency ISO14443A commands
 //-----------------------------------------------------------------------------
 
 // High frequency ISO14443A commands
 //-----------------------------------------------------------------------------
 

+#include "cmdhf14a.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>


@@ -21,21 +23,17 @@
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"

-#include "cmdhf14a.h"

 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
 #include "mifarehost.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
 #include "mifarehost.h"

+#include "emv/apduinfo.h"
+#include "emv/emvcore.h"

 
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 
 
 static int CmdHelp(const char *Cmd);
 static int waitCmd(uint8_t iLen);
 

-// structure and database for uid -> tagtype lookups 
-typedef struct { 
-       uint8_t uid;
-       char* desc;
-} manufactureName; 

 
 const manufactureName manufactureMapping[] = {
        // ID,  "Vendor Country"
 
 const manufactureName manufactureMapping[] = {
        // ID,  "Vendor Country"


@@ -110,7 +108,6 @@ const manufactureName manufactureMapping[] = {
        { 0x00, "no tag-info available" } // must be the last entry
 };
 
        { 0x00, "no tag-info available" } // must be the last entry
 };
 

-

 // get a product description based on the UID
 //             uid[8]  tag uid
 // returns description of the best match       
 // get a product description based on the UID
 //             uid[8]  tag uid
 // returns description of the best match       


@@ -133,7 +130,84 @@ int CmdHF14AList(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdHF14AReader(const char *Cmd)
+int CmdHF14AReader(const char *Cmd) {
+       uint32_t cm = ISO14A_CONNECT;
+       bool disconnectAfter = true;
+       
+       int cmdp = 0;
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
+               case 'h':
+               case 'H':
+                       PrintAndLog("Usage: hf 14a reader [k|x] [3]");
+                       PrintAndLog("       k    keep the field active after command executed");
+                       PrintAndLog("       x    just drop the signal field");
+                       PrintAndLog("       3    ISO14443-3 select only (skip RATS)");
+                       return 0;
+               case '3':
+                       cm |= ISO14A_NO_RATS; 
+                       break;
+               case 'k':
+               case 'K':
+                       disconnectAfter = false;
+                       break;
+               case 'x':
+               case 'X':
+                       cm = cm - ISO14A_CONNECT;
+                       break;
+               default:
+                       PrintAndLog("Unknown command.");
+                       return 1;
+               }       
+               
+               cmdp++;
+       }
+
+       if (!disconnectAfter)
+               cm |= ISO14A_NO_DISCONNECT; 
+       
+       UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
+       SendCommand(&c);
+
+       if (ISO14A_CONNECT & cm) {
+               UsbCommand resp;
+               WaitForResponse(CMD_ACK,&resp);
+               
+               iso14a_card_select_t card;
+               memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+               uint64_t select_status = resp.arg[0];           // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
+               
+               if(select_status == 0) {
+                       PrintAndLog("iso14443a card select failed");
+                       return 1;
+               }
+
+               if(select_status == 3) {
+                       PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
+                       PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+                       return 1;
+               }
+
+               PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+               PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+               PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
+               if(card.ats_len >= 3) {                 // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
+                       PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
+               }
+               if (!disconnectAfter) {
+                       PrintAndLog("Card is selected. You can now start sending commands");
+               }
+       }
+
+       if (disconnectAfter) {
+               PrintAndLog("Field dropped.");
+       }
+       
+       return 0;
+}
+
+int CmdHF14AInfo(const char *Cmd)

 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        SendCommand(&c);
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
        SendCommand(&c);


@@ -171,8 +245,10 @@ int CmdHF14AReader(const char *Cmd)
        PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
        PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
 
        PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
        PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
 

+       bool isMifareClassic = true;

        switch (card.sak) {
                case 0x00: 
        switch (card.sak) {
                case 0x00: 

+                       isMifareClassic = false;

 
                        //***************************************test****************
                        // disconnect
 
                        //***************************************test****************
                        // disconnect


@@ -407,6 +483,19 @@ int CmdHF14AReader(const char *Cmd)
        // try to see if card responses to "chinese magic backdoor" commands.
        mfCIdentify();
        
        // try to see if card responses to "chinese magic backdoor" commands.
        mfCIdentify();
        

+       if (isMifareClassic) {          
+               switch(DetectClassicPrng()) {
+               case 0:
+                       PrintAndLog("Prng detection: HARDEND (hardnested)");            
+                       break;
+               case 1:
+                       PrintAndLog("Prng detection: WEAK");
+                       break;
+               default:
+                       PrintAndLog("Prng detection error.");           
+               }
+       }
+       

        return select_status;
 }
 
        return select_status;
 }
 


@@ -554,33 +643,110 @@ int CmdHF14ASnoop(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 

+void DropField() {
+       UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}}; 
+       SendCommand(&c);
+}
+
+int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
+       uint16_t cmdc = 0;
+       
+       if (activateField) {
+               cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
+       }
+       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 must be authomatically set by "get ATS"
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | cmdc, (datainlen & 0xFFFF), 0}}; 
+       memcpy(c.d.asBytes, datain, datainlen);
+       SendCommand(&c);
+       
+    uint8_t *recv;
+    UsbCommand resp;
+
+       if (activateField) {
+               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+                       PrintAndLog("APDU ERROR: Proxmark connection timeout.");
+                       return 1;
+               }
+               if (resp.arg[0] != 1) {
+                       PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
+                       return 1;
+               }
+       }
+
+    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
+        recv = resp.d.asBytes;
+        int iLen = resp.arg[0];
+               
+               *dataoutlen = iLen - 2;
+               if (*dataoutlen < 0)
+                       *dataoutlen = 0;
+               
+               if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
+                       PrintAndLog("APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
+                       return 2;
+               }
+               
+               memcpy(dataout, recv, *dataoutlen);
+               
+        if(!iLen) {
+                       PrintAndLog("APDU ERROR: No APDU response.");
+            return 1;
+               }
+
+               // check block TODO
+               if (iLen == -2) {
+                       PrintAndLog("APDU ERROR: Block type mismatch.");
+                       return 2;
+               }
+               
+               // CRC Check
+               if (iLen == -1) {
+                       PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
+                       return 3;
+               }
+
+               // check apdu length
+               if (iLen < 4) {
+                       PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
+                       return 2;
+               }
+               
+    } else {
+        PrintAndLog("APDU ERROR: Reply timeout.");
+               return 4;
+    }
+       
+       return 0;
+}
+
+// ISO14443-4. 7. Half-duplex block transmission protocol

 int CmdHF14AAPDU(const char *cmd) {
        uint8_t data[USB_CMD_DATA_SIZE];
 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;
-       uint8_t first, second;
+       int datalen = 0;

        bool activateField = false;
        bool leaveSignalON = false;
        bool decodeTLV = false;
        
        bool activateField = false;
        bool leaveSignalON = false;
        bool decodeTLV = false;
        

-       if (strlen(cmd)<2) {
+       if (strlen(cmd) < 2) {

                PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");
                PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");

+               PrintAndLog("Command sends an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol (T=CL)");

                PrintAndLog("       -s    activate field and select card");
                PrintAndLog("       -k    leave the signal field ON after receive response");
                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");
+               PrintAndLog("       -t    executes TLV decoder if it possible. TODO!!!!");

                return 0;
        }
 
                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]) {
+       int cmdp = 0;
+       while(param_getchar(cmd, cmdp) != 0x00) {
+               char c = param_getchar(cmd, cmdp);
+               if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
+                       switch (param_getchar_indx(cmd, 1, cmdp)) {

                                case 's':
                                case 'S':
                                        activateField = true;
                                case 's':
                                case 'S':
                                        activateField = true;


@@ -594,111 +760,46 @@ int CmdHF14AAPDU(const char *cmd) {
                                        decodeTLV = true;
                                        break;
                                default:
                                        decodeTLV = true;
                                        break;
                                default:

-                                       PrintAndLog("Invalid option");
+                                       PrintAndLog("Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));

                                        return 1;
                        }
                                        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++;
-                               }
+                       
+               if (isxdigit(c)) {
+                       // len = data + PCB(1b) + CRC(2b)
+                       switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
+                       case 1:
+                               PrintAndLog("Invalid HEX value.");
+                               return 1;
+                       case 2:
+                               PrintAndLog("APDU too large.");
+                               return 1;
+                       case 3:
+                               PrintAndLog("Hex must have even number of digits.");
+                               return 1;

                        }
                        }

-                       continue;
+                       
+                       // we get all the hex to end of line with spaces
+                       break;

                }
                }

-               PrintAndLog("Invalid char on input");
-               return 1;
+               
+               cmdp++;

        }
        }

-       if (*buf) {
-               PrintAndLog("Hex must have even number of digits. Detected %d symbols.", datalen * 2 + strlen(buf));
-               return 1;
-       }               
-       
-       if (activateField)
-               cmdc |= ISO14A_CONNECT;
-       if (leaveSignalON)
-               cmdc |= ISO14A_NO_DISCONNECT;

 
 

-       // ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
-       memmove(data + 1, data, datalen);
-       data[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)     
-       datalen++;
+       PrintAndLog(">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));

        
        

-       ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
-       data[datalen++] = first;
-       data[datalen++] = second;
+       int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, USB_CMD_DATA_SIZE, &datalen);

 
 

-       PrintAndLog("--%s %s %s >>>> %s", activateField ? "sel": "", leaveSignalON ? "keep": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
-       
-       // "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_RAW | ISO14A_SET_TIMEOUT | cmdc, (datalen & 0xFFFF), 1000 * 1000 * 1.06 / 100}}; 
-       memcpy(c.d.asBytes, data, datalen);
-       SendCommand(&c);
+       if (res)
+               return res;
+
+       PrintAndLog("<<<< %s", sprint_hex(data, datalen));

        
        

-    uint8_t *recv;
-    UsbCommand resp;
+       PrintAndLog("APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1])); 

 
 

-       if (activateField) {
-               if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) 
-                       return 2;
-               if (resp.arg[0] != 1)
-                       return 2;
+       // TLV decoder
+       if (decodeTLV && datalen > 4) {
+               TLVPrintFromBuffer(data, datalen - 2);

        }
        }

-
-    if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
-        recv = resp.d.asBytes;
-        uint8_t iLen = resp.arg[0];
-        if(!iLen)
-            return 2;
-
-               PrintAndLog("<<<< %s", sprint_hex(recv, iLen));
-               
-               // check apdu length
-               if (iLen < 5) {
-                       PrintAndLog("ERROR: Small APDU response.");
-                       return 3;
-               }
-               
-               // check block
-               if (data[0] != recv[0]) {
-                       PrintAndLog("ERROR: Block type mismatch: %02x-%02x", data[0], recv[0]);
-                       return 3;
-               }
-               
-               // CRC Check
-               ComputeCrc14443(CRC_14443_A, recv, iLen, &first, &second);
-               if (first || second) {
-                       PrintAndLog("ERROR: ISO 14443A CRC error.");
-                       return 3;
-               }
-               
-               PrintAndLog("APDU response: %02x %02x", recv[iLen - 4], recv[iLen - 3]); // TODO add APDU descriptions
-               
-               // here TLV decoder...
-               if (decodeTLV) {
-               }
-               
-    } else {
-        PrintAndLog("ERROR: Reply timeout.");
-               return 3;
-    }

        
        return 0;
 }
        
        return 0;
 }


@@ -825,7 +926,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 
        if(active || active_select)
        {
 
        if(active || active_select)
        {

-               c.arg[0] |= ISO14A_CONNECT;
+               c.arg[0] |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;

                if(active)
                        c.arg[0] |= ISO14A_NO_SELECT;
        }
                if(active)
                        c.arg[0] |= ISO14A_NO_SELECT;
        }


@@ -880,8 +981,17 @@ static int waitCmd(uint8_t iSelect) {
 
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
         recv = resp.d.asBytes;
 
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
         recv = resp.d.asBytes;

-        uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
-        PrintAndLog("received %i octets", iLen);
+        uint8_t iLen = resp.arg[0];
+               if (iSelect){
+                       iLen = resp.arg[1];
+                       if (iLen){
+                               PrintAndLog("Card selected. UID[%i]:", iLen);
+                       } else {
+                               PrintAndLog("Can't select card.");
+                       }
+               } else {
+                       PrintAndLog("received %i bytes:", iLen);
+               }

         if(!iLen)
             return 1;
         hexout = (char *)malloc(iLen * 3 + 1);
         if(!iLen)
             return 1;
         hexout = (char *)malloc(iLen * 3 + 1);


@@ -906,11 +1016,12 @@ static command_t CommandTable[] =
 {
   {"help",   CmdHelp,              1, "This help"},
   {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
 {
   {"help",   CmdHelp,              1, "This help"},
   {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},

-  {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
+  {"reader", CmdHF14AReader,       0, "Start acting like an ISO14443 Type A reader"},
+  {"info",   CmdHF14AInfo,         0, "Reads card and shows information about it"},

   {"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"},
   {"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"},
+  {"apdu",   CmdHF14AAPDU,         0, "Send an ISO 7816-4 APDU via ISO 14443-4 block transmission protocol"},

   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
 };
   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
 };