buspirate config for debricking

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 147e790ec0f15c1213289fe5f39b72d82a6e0b16..ecf3ba03e99b3de9ae7ff23fb0a53d3779a34bb1 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -23,6 +23,7 @@
 #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);


@@ -129,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}};


@@ -145,10 +141,21 @@ int CmdHF14AReader(const char *Cmd)
        iso14a_card_select_t card;
        memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
 
        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
+       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) {
        
        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;


@@ -157,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;


@@ -185,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


@@ -195,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
        } 
 


@@ -289,16 +352,16 @@ int CmdHF14AReader(const char *Cmd)
                                                PrintAndLog("                     x0 -> <1 kByte");
                                                break;
                                        case 0x01:
                                                PrintAndLog("                     x0 -> <1 kByte");
                                                break;
                                        case 0x01:

-                                               PrintAndLog("                     x0 -> 1 kByte");
+                                               PrintAndLog("                     x1 -> 1 kByte");

                                                break;
                                        case 0x02:
                                                break;
                                        case 0x02:

-                                               PrintAndLog("                     x0 -> 2 kByte");
+                                               PrintAndLog("                     x2 -> 2 kByte");

                                                break;
                                        case 0x03:
                                                break;
                                        case 0x03:

-                                               PrintAndLog("                     x0 -> 4 kByte");
+                                               PrintAndLog("                     x3 -> 4 kByte");

                                                break;
                                        case 0x04:
                                                break;
                                        case 0x04:

-                                               PrintAndLog("                     x0 -> 8 kByte");
+                                               PrintAndLog("                     x4 -> 8 kByte");

                                                break;
                                }
                                switch (card.ats[pos + 3] & 0xf0) {
                                                break;
                                }
                                switch (card.ats[pos + 3] & 0xf0) {


@@ -346,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;


@@ -502,20 +565,23 @@ int CmdHF14ASnoop(const char *Cmd) {
   return 0;
 }
 
   return 0;
 }
 

+

 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};

-    uint8_t reply=1;
-    uint8_t crc=0;
-    uint8_t power=0;
-    uint8_t active=0;
-    uint8_t active_select=0;
-    uint16_t numbits=0;
-       uint16_t timeout=0;
-       uint8_t bTimeout=0;
+    bool reply=1;
+    bool crc = FALSE;
+    bool power = FALSE;
+    bool active = FALSE;
+    bool active_select = FALSE;
+    uint16_t numbits = 0;
+       bool bTimeout = FALSE;
+       uint32_t timeout = 0;
+       bool topazmode = FALSE;

     char buf[5]="";
     char buf[5]="";

-    int i=0;
+    int i = 0;

     uint8_t data[USB_CMD_DATA_SIZE];
     uint8_t data[USB_CMD_DATA_SIZE];

-    unsigned int datalen=0, temp;
+       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>");
 
     if (strlen(cmd)<2) {
         PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");


@@ -525,10 +591,12 @@ int CmdHF14ACmdRaw(const char *cmd) {
         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("       -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");
+               PrintAndLog("       -t    timeout in ms");
+               PrintAndLog("       -T    use Topaz protocol to send command");

         return 0;
     }
 
         return 0;
     }
 

+       

     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
 


@@ -537,19 +605,19 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
                 case 'r': 
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
                 case 'r': 

-                    reply=0;
+                    reply = FALSE;

                     break;
                 case 'c':
                     break;
                 case 'c':

-                    crc=1;
+                    crc = TRUE;

                     break;
                 case 'p':
                     break;
                 case 'p':

-                    power=1;
+                    power = TRUE;

                     break;
                 case 'a':
                     break;
                 case 'a':

-                    active=1;
+                    active = TRUE;

                     break;
                 case 's':
                     break;
                 case 's':

-                    active_select=1;
+                    active_select = TRUE;

                     break;
                 case 'b': 
                     sscanf(cmd+i+2,"%d",&temp);
                     break;
                 case 'b': 
                     sscanf(cmd+i+2,"%d",&temp);


@@ -559,12 +627,15 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     i-=2;
                     break;
                                case 't':
                     i-=2;
                     break;
                                case 't':

-                                       bTimeout=1;
+                                       bTimeout = TRUE;

                                        sscanf(cmd+i+2,"%d",&temp);
                                        sscanf(cmd+i+2,"%d",&temp);

-                                       timeout = temp & 0xFFFF;
+                                       timeout = temp;

                                        i+=3;
                                        while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
                                        i+=3;
                                        while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }

-                                       i+=2;
+                                       i-=2;
+                                       break;
+                case 'T':
+                                       topazmode = TRUE;

                                        break;
                 default:
                     PrintAndLog("Invalid option");
                                        break;
                 default:
                     PrintAndLog("Invalid option");


@@ -595,10 +666,15 @@ int CmdHF14ACmdRaw(const char *cmd) {
         PrintAndLog("Invalid char on input");
         return 0;
     }
         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;

-        ComputeCrc14443(CRC_14443_A, data, datalen, &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;
     }


@@ -609,20 +685,29 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if(active)
             c.arg[0] |= ISO14A_NO_SELECT;
     }
         if(active)
             c.arg[0] |= ISO14A_NO_SELECT;
     }

+

        if(bTimeout){
        if(bTimeout){

-           #define MAX_TIMEOUT 624*105 // max timeout is 624 ms
+           #define MAX_TIMEOUT 40542464        // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s

         c.arg[0] |= ISO14A_SET_TIMEOUT;
         c.arg[0] |= ISO14A_SET_TIMEOUT;

-        c.arg[2] = timeout * 105; // each bit is about 9.4 us
-        if(c.arg[2]>MAX_TIMEOUT) {
-            c.arg[2] = MAX_TIMEOUT;
-            PrintAndLog("Set timeout to 624 ms. The max we can wait for response");
+        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)
+
+    if(power) {

         c.arg[0] |= ISO14A_NO_DISCONNECT;
         c.arg[0] |= ISO14A_NO_DISCONNECT;

-    if(datalen>0)
+    }
+
+       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);
        // Max buffer is USB_CMD_DATA_SIZE
     c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);
     memcpy(c.d.asBytes,data,datalen);


@@ -638,6 +723,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
     return 0;
 }
 

+

 static void waitCmd(uint8_t iSelect)
 {
     uint8_t *recv;
 static void waitCmd(uint8_t iSelect)
 {
     uint8_t *recv;


@@ -647,7 +733,7 @@ static void waitCmd(uint8_t iSelect)
     if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
         recv = resp.d.asBytes;
         uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
     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);
+        PrintAndLog("received %i octets", iLen);

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