update change log for adjusted 14b write cmd

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 0298f509416015cadc11e26502fe662a755f3124..9a761864b3fbc984ef21d839b0db886a69aeb647 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -23,11 +23,11 @@
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"
 #include "common.h"
 #include "cmdmain.h"
 #include "mifare.h"

+#include "cmdhfmfu.h"

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

-

 // structure and database for uid -> tagtype lookups 
 typedef struct { 
        uint8_t uid;
 // structure and database for uid -> tagtype lookups 
 typedef struct { 
        uint8_t uid;


@@ -113,20 +113,15 @@ const manufactureName manufactureMapping[] = {
 // returns description of the best match       
 char* getTagInfo(uint8_t uid) {
 
 // returns description of the best match       
 char* getTagInfo(uint8_t uid) {
 

-       int i, best = -1;       
+       int i;

        int len = sizeof(manufactureMapping) / sizeof(manufactureName);
        
        int len = sizeof(manufactureMapping) / sizeof(manufactureName);
        

-       for ( i = 0; i < len; ++i ) {
-               if ( uid == manufactureMapping[i].uid) {
-                       if (best == -1) { 
-                               best = i;
-                       } 
-               } 
-       } 
+       for ( i = 0; i < len; ++i ) 
+               if ( uid == manufactureMapping[i].uid) 
+                       return manufactureMapping[i].desc;

 
 

-       if (best>=0) return manufactureMapping[best].desc;
-       
-       return manufactureMapping[i].desc; 
+       //No match, return default
+       return manufactureMapping[len-1].desc; 

 }
 
 int CmdHF14AList(const char *Cmd)
 }
 
 int CmdHF14AList(const char *Cmd)


@@ -135,11 +130,6 @@ int CmdHF14AList(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-void iso14a_set_timeout(uint32_t timeout) {
-       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_SET_TIMEOUT, 0, timeout}};
-       SendCommand(&c);
-}
-

 int CmdHF14AReader(const char *Cmd)
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
 int CmdHF14AReader(const char *Cmd)
 {
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};


@@ -154,7 +144,18 @@ int CmdHF14AReader(const char *Cmd)
        uint64_t select_status = resp.arg[0];           // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
        
        if(select_status == 0) {
        uint64_t select_status = resp.arg[0];           // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
        
        if(select_status == 0) {

-               PrintAndLog("iso14443a card select failed");
+               if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
+               // disconnect
+               c.arg[0] = 0;
+               c.arg[1] = 0;
+               c.arg[2] = 0;
+               SendCommand(&c);
+               return 0;
+       }
+
+       if(select_status == 3) {
+               PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
+               PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);

                // disconnect
                c.arg[0] = 0;
                c.arg[1] = 0;
                // disconnect
                c.arg[0] = 0;
                c.arg[1] = 0;


@@ -163,18 +164,68 @@ int CmdHF14AReader(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 

-       PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);

        PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
        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]);
 
        PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
 

-       // Double & triple sized UID, can be mapped to a manufacturer.
-       // HACK: does this apply for Ultralight cards?
-       if ( card.uidlen > 4 ) {
-               PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
-       }
-

        switch (card.sak) {
        switch (card.sak) {

-               case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
+               case 0x00: 
+
+                       //***************************************test****************
+                       // disconnect
+                       c.arg[0] = 0;
+                       c.arg[1] = 0;
+                       c.arg[2] = 0;
+                       SendCommand(&c);
+                       
+                       uint32_t tagT = GetHF14AMfU_Type();
+                       ul_print_type(tagT, 0);
+
+                       //reconnect for further tests
+                       c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
+                       c.arg[1] = 0;
+                       c.arg[2] = 0;
+
+                       SendCommand(&c);
+
+                       UsbCommand resp;
+                       WaitForResponse(CMD_ACK,&resp);
+                       
+                       memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
+
+                       select_status = resp.arg[0];            // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+                       
+                       if(select_status == 0) {
+                               //PrintAndLog("iso14443a card select failed");
+                               // disconnect
+                               c.arg[0] = 0;
+                               c.arg[1] = 0;
+                               c.arg[2] = 0;
+                               SendCommand(&c);
+                               return 0;
+                       }
+
+                       /*  orig
+                       // check if the tag answers to GETVERSION (0x60)
+                       c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+                       c.arg[1] = 1;
+                       c.arg[2] = 0;
+                       c.d.asBytes[0] = 0x60;
+                       SendCommand(&c);
+                       WaitForResponse(CMD_ACK,&resp);
+
+                       uint8_t version[10] = {0};
+                       memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
+                       uint8_t len = resp.arg[0] & 0xff;
+                       switch ( len ){
+                               // todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
+                               // UL-EV1, size, check version[6] == 0x0b (smaller)  0x0b * 4 == 48
+                               case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);break;
+                               case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
+                               case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;    
+                       }
+                       */
+                       break;

                case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
                case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
                case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
                case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;


@@ -191,6 +242,12 @@ int CmdHF14AReader(const char *Cmd)
                default: ;
        }
 
                default: ;
        }
 

+       // Double & triple sized UID, can be mapped to a manufacturer.
+       // HACK: does this apply for Ultralight cards?
+       if ( card.uidlen > 4 ) {
+               PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+       }
+

        // try to request ATS even if tag claims not to support it
        if (select_status == 2) {
                uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
        // try to request ATS even if tag claims not to support it
        if (select_status == 2) {
                uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0


@@ -201,7 +258,7 @@ int CmdHF14AReader(const char *Cmd)
                SendCommand(&c);
                WaitForResponse(CMD_ACK,&resp);
                
                SendCommand(&c);
                WaitForResponse(CMD_ACK,&resp);
                

-           memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+           memcpy(card.ats, resp.d.asBytes, resp.arg[0]);

                card.ats_len = resp.arg[0];                             // note: ats_len includes CRC Bytes
        } 
 
                card.ats_len = resp.arg[0];                             // note: ats_len includes CRC Bytes
        } 
 


@@ -352,7 +409,7 @@ int CmdHF14AReader(const char *Cmd)
        SendCommand(&c);
        WaitForResponse(CMD_ACK,&resp);
        uint8_t isOK  = resp.arg[0] & 0xff;
        SendCommand(&c);
        WaitForResponse(CMD_ACK,&resp);
        uint8_t isOK  = resp.arg[0] & 0xff;

-       PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+       PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );

        
        // disconnect
        c.cmd = CMD_READER_ISO_14443a;
        
        // disconnect
        c.cmd = CMD_READER_ISO_14443a;


@@ -418,9 +475,9 @@ int CmdHF14ASim(const char *Cmd)
                PrintAndLog("   syntax: hf 14a sim <type> <uid>");
                PrintAndLog("    types: 1 = MIFARE Classic");
                PrintAndLog("           2 = MIFARE Ultralight");
                PrintAndLog("   syntax: hf 14a sim <type> <uid>");
                PrintAndLog("    types: 1 = MIFARE Classic");
                PrintAndLog("           2 = MIFARE Ultralight");

-               PrintAndLog("           3 = MIFARE DESFIRE");
+               PrintAndLog("           3 = MIFARE Desfire");

                PrintAndLog("           4 = ISO/IEC 14443-4");
                PrintAndLog("           4 = ISO/IEC 14443-4");

-               PrintAndLog("           5 = MIFARE TNP3XXX");           
+               PrintAndLog("           5 = MIFARE Tnp3xxx");           

                PrintAndLog("");
                return 1;
        }
                PrintAndLog("");
                return 1;
        }


@@ -486,7 +543,8 @@ int CmdHF14ASim(const char *Cmd)
 int CmdHF14ASnoop(const char *Cmd) {
        int param = 0;
        
 int CmdHF14ASnoop(const char *Cmd) {
        int param = 0;
        

-       if (param_getchar(Cmd, 0) == 'h') {
+       uint8_t ctmp = param_getchar(Cmd, 0) ;
+       if (ctmp == 'h' || ctmp == 'H') {

                PrintAndLog("It get data from the field and saves it into command buffer.");
                PrintAndLog("Buffer accessible from command hf list 14a.");
                PrintAndLog("Usage:  hf 14a snoop [c][r]");
                PrintAndLog("It get data from the field and saves it into command buffer.");
                PrintAndLog("Buffer accessible from command hf list 14a.");
                PrintAndLog("Usage:  hf 14a snoop [c][r]");


@@ -497,7 +555,7 @@ int CmdHF14ASnoop(const char *Cmd) {
        }       
        
        for (int i = 0; i < 2; i++) {
        }       
        
        for (int i = 0; i < 2; i++) {

-               char ctmp = param_getchar(Cmd, i);
+               ctmp = param_getchar(Cmd, i);

                if (ctmp == 'c' || ctmp == 'C') param |= 0x01;
                if (ctmp == 'r' || ctmp == 'R') param |= 0x02;
        }
                if (ctmp == 'c' || ctmp == 'C') param |= 0x01;
                if (ctmp == 'r' || ctmp == 'R') param |= 0x02;
        }


@@ -515,19 +573,23 @@ int CmdHF14ACmdRaw(const char *cmd) {
     uint8_t active=0;
     uint8_t active_select=0;
     uint16_t numbits=0;
     uint8_t active=0;
     uint8_t active_select=0;
     uint16_t numbits=0;

+       uint32_t timeout=0;
+       uint8_t bTimeout=0;

     char buf[5]="";
     int i=0;
     char buf[5]="";
     int i=0;

-    uint8_t data[100];
-    unsigned int datalen=0, temp;
+    uint8_t data[USB_CMD_DATA_SIZE];
+       uint16_t datalen=0;
+       uint32_t temp;

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

-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] <number of bits> <0A 0B 0C ... hex>");
+        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("       -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");

         return 0;
     }
 
         return 0;
     }
 


@@ -560,6 +622,14 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
                     i-=2;
                     break;
                     while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
                     i-=2;
                     break;

+                               case 't':
+                                       bTimeout=1;
+                                       sscanf(cmd+i+2,"%d",&temp);
+                                       timeout = temp;
+                                       i+=3;
+                                       while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
+                                       i-=2;
+                                       break;

                 default:
                     PrintAndLog("Invalid option");
                     return 0;
                 default:
                     PrintAndLog("Invalid option");
                     return 0;


@@ -577,15 +647,19 @@ int CmdHF14ACmdRaw(const char *cmd) {
             if (strlen(buf)>=2) {
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);
             if (strlen(buf)>=2) {
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);

-                datalen++;

                 *buf=0;
                 *buf=0;

+                               if (++datalen>sizeof(data)){
+                                       if (crc)
+                                               PrintAndLog("Buffer is full, we can't add CRC to your data");
+                                       break;
+                               }

             }
             continue;
         }
         PrintAndLog("Invalid char on input");
         return 0;
     }
             }
             continue;
         }
         PrintAndLog("Invalid char on input");
         return 0;
     }

-    if(crc && datalen>0)
+    if(crc && datalen>0 && datalen<sizeof(data)-2)

     {
         uint8_t first, second;
         ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
     {
         uint8_t first, second;
         ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);


@@ -599,13 +673,23 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if(active)
             c.arg[0] |= ISO14A_NO_SELECT;
     }
         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");
+        }
+               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(datalen>0)
         c.arg[0] |= ISO14A_RAW;
 
     if(power)
         c.arg[0] |= ISO14A_NO_DISCONNECT;
     if(datalen>0)
         c.arg[0] |= ISO14A_RAW;
 

-    c.arg[1] = datalen;
-    c.arg[2] = numbits;
+       // Max buffer is USB_CMD_DATA_SIZE
+    c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);

     memcpy(c.d.asBytes,data,datalen);
 
     SendCommand(&c);
     memcpy(c.d.asBytes,data,datalen);
 
     SendCommand(&c);


@@ -652,7 +736,7 @@ static command_t CommandTable[] =
   {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
   {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
   {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
   {"list",   CmdHF14AList,         0, "[Deprecated] List ISO 14443a history"},
   {"reader", CmdHF14AReader,       0, "Act like an ISO14443 Type A reader"},
   {"cuids",  CmdHF14ACUIDs,        0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},

-  {"sim",    CmdHF14ASim,          0, "<UID> -- Fake ISO 14443a tag"},
+  {"sim",    CmdHF14ASim,          0, "<UID> -- Simulate ISO 14443a tag"},

   {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}
   {"snoop",  CmdHF14ASnoop,        0, "Eavesdrop ISO 14443 Type A"},
   {"raw",    CmdHF14ACmdRaw,       0, "Send raw hex data to tag"},
   {NULL, NULL, 0, NULL}