]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf14a.c
Limit to single-DES operation and return session key to client.
[proxmark3-svn] / client / cmdhf14a.c
index f7e0ffa998d0a76961d72bc833de3399f88f7cde..bd19cee41990aa1056852854450a4f1dd53c5382 100644 (file)
 #include <string.h>
 #include <unistd.h>
 #include "util.h"
-#include "iso14443crc.h"
+#include "../common/iso14443crc.h"
 #include "data.h"
-//#include "proxusb.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14a.h"
-#include "common.h"
+#include "../include/common.h"
 #include "cmdmain.h"
-#include "mifare.h"
+#include "../include/mifare.h"
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
 
 int CmdHF14AList(const char *Cmd)
 {
-  uint8_t got[1920];
-  GetFromBigBuf(got,sizeof(got),0);
-  WaitForResponse(CMD_ACK,NULL);
-
-  PrintAndLog("recorded activity:");
-  PrintAndLog(" ETU     :rssi: who bytes");
-  PrintAndLog("---------+----+----+-----------");
-
-  int i = 0;
-  int prev = -1;
+       bool ShowWaitCycles = false;
+       char param = param_getchar(Cmd, 0);
+       
+       if (param == 'h' || (param != 0 && param != 'f')) {
+               PrintAndLog("List data in trace buffer.");
+               PrintAndLog("Usage:  hf 14a list [f]");
+               PrintAndLog("f - show frame delay times as well");
+               PrintAndLog("sample: hf 14a list f");
+               return 0;
+       }       
 
-  for (;;) {
-    if(i >= 1900) {
-      break;
-    }
+       if (param == 'f') {
+               ShowWaitCycles = true;
+       }
+               
+       uint8_t got[1920];
+       GetFromBigBuf(got,sizeof(got),0);
+       WaitForResponse(CMD_ACK,NULL);
+
+       PrintAndLog("Recorded Activity");
+       PrintAndLog("");
+       PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
+       PrintAndLog("All times are in carrier periods (1/13.56Mhz)");
+       PrintAndLog("");
+       PrintAndLog("     Start |       End | Src | Data");
+       PrintAndLog("-----------|-----------|-----|--------");
+
+       int i = 0;
+       uint32_t first_timestamp = 0;
+       uint32_t timestamp;
+       uint32_t EndOfTransmissionTimestamp = 0;
+       
+       for (;;) {
+               if(i >= 1900) {
+                       break;
+               }
 
-    bool isResponse;
-    int timestamp = *((uint32_t *)(got+i));
-    if (timestamp & 0x80000000) {
-      timestamp &= 0x7fffffff;
-      isResponse = 1;
-    } else {
-      isResponse = 0;
-    }
+               bool isResponse;
+               timestamp = *((uint32_t *)(got+i));
+               if (timestamp & 0x80000000) {
+                 timestamp &= 0x7fffffff;
+                 isResponse = true;
+               } else {
+                 isResponse = false;
+               }
 
-    int metric = 0;
-    int parityBits = *((uint32_t *)(got+i+4));
-    // 4 bytes of additional information...
-    // maximum of 32 additional parity bit information
-    //
-    // TODO:
-    // at each quarter bit period we can send power level (16 levels)
-    // or each half bit period in 256 levels.
+               if(i==0) {
+                       first_timestamp = timestamp;
+               }
+               
+               int parityBits = *((uint32_t *)(got+i+4));
 
+               int len = got[i+8];
 
-    int len = got[i+8];
+               if (len > 100) {
+                       break;
+               }
+               if (i + len >= 1900) {
+                       break;
+               }
 
-    if (len > 100) {
-      break;
-    }
-    if (i + len >= 1900) {
-      break;
-    }
+               uint8_t *frame = (got+i+9);
 
-    uint8_t *frame = (got+i+9);
+               // Break and stick with current result if buffer was not completely full
+               if (frame[0] == 0x44 && frame[1] == 0x44 && frame[2] == 0x44 && frame[3] == 0x44) break; 
 
-    // Break and stick with current result if buffer was not completely full
-    if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
+               char line[1000] = "";
+               int j;
+               if (len) {
+                       for (j = 0; j < len; j++) {
+                               int oddparity = 0x01;
+                               int k;
 
-    char line[1000] = "";
-    int j;
-    for (j = 0; j < len; j++) {
-      int oddparity = 0x01;
-      int k;
+                               for (k=0;k<8;k++) {
+                                       oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
+                               }
 
-      for (k=0;k<8;k++) {
-        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-      }
+                               //if((parityBits >> (len - j - 1)) & 0x01) {
+                               if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
+                                       sprintf(line+(j*4), "%02x!  ", frame[j]);
+                               } else {
+                                       sprintf(line+(j*4), "%02x   ", frame[j]);
+                               }
+                       }
+               } else {
+                       if (ShowWaitCycles) {
+                               uint32_t next_timestamp = (*((uint32_t *)(got+i+9))) & 0x7fffffff;
+                               sprintf(line, "fdt (Frame Delay Time): %d", (next_timestamp - timestamp));
+                       }
+               }
 
-      //if((parityBits >> (len - j - 1)) & 0x01) {
-      if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
-        sprintf(line+(j*4), "%02x!  ", frame[j]);
-      }
-      else {
-        sprintf(line+(j*4), "%02x   ", frame[j]);
-      }
-    }
+               char *crc;
+               crc = "";
+               if (len > 2) {
+                       uint8_t b1, b2;
+                       for (j = 0; j < (len - 1); j++) {
+                               // gives problems... search for the reason..
+                               /*if(frame[j] == 0xAA) {
+                                       switch(frame[j+1]) {
+                                               case 0x01:
+                                                       crc = "[1] Two drops close after each other";
+                                                       break;
+                                               case 0x02:
+                                                       crc = "[2] Potential SOC with a drop in second half of bitperiod";
+                                                       break;
+                                               case 0x03:
+                                                       crc = "[3] Segment Z after segment X is not possible";
+                                                       break;
+                                               case 0x04:
+                                                       crc = "[4] Parity bit of a fully received byte was wrong";
+                                                       break;
+                                               default:
+                                                       crc = "[?] Unknown error";
+                                                       break;
+                                       }
+                                       break;
+                               }*/
+                       }
 
-    char *crc;
-    crc = "";
-    if (len > 2) {
-      uint8_t b1, b2;
-      for (j = 0; j < (len - 1); j++) {
-        // gives problems... search for the reason..
-        /*if(frame[j] == 0xAA) {
-          switch(frame[j+1]) {
-            case 0x01:
-              crc = "[1] Two drops close after each other";
-            break;
-            case 0x02:
-              crc = "[2] Potential SOC with a drop in second half of bitperiod";
-              break;
-            case 0x03:
-              crc = "[3] Segment Z after segment X is not possible";
-              break;
-            case 0x04:
-              crc = "[4] Parity bit of a fully received byte was wrong";
-              break;
-            default:
-              crc = "[?] Unknown error";
-              break;
-          }
-          break;
-        }*/
-      }
-
-      if (strlen(crc)==0) {
-        ComputeCrc14443(CRC_14443_A, frame, len-2, &b1, &b2);
-        if (b1 != frame[len-2] || b2 != frame[len-1]) {
-          crc = (isResponse & (len < 6)) ? "" : " !crc";
-        } else {
-          crc = "";
-        }
-      }
-    } else {
-      crc = ""; // SHORT
-    }
+                       if (strlen(crc)==0) {
+                               ComputeCrc14443(CRC_14443_A, frame, len-2, &b1, &b2);
+                               if (b1 != frame[len-2] || b2 != frame[len-1]) {
+                                       crc = (isResponse & (len < 6)) ? "" : " !crc";
+                               } else {
+                                       crc = "";
+                               }
+                       }
+               } else {
+                       crc = ""; // SHORT
+               }
 
-    char metricString[100];
-    if (isResponse) {
-      sprintf(metricString, "%3d", metric);
-    } else {
-      strcpy(metricString, "   ");
-    }
+               i += (len + 9);
 
-    PrintAndLog(" +%7d: %s: %s %s %s",
-      (prev < 0 ? 0 : (timestamp - prev)),
-      metricString,
-      (isResponse ? "TAG" : "   "), line, crc);
+               EndOfTransmissionTimestamp = (*((uint32_t *)(got+i))) & 0x7fffffff;
+               
+               if (!ShowWaitCycles) i += 9;
+               
+               PrintAndLog(" %9d | %9d | %s | %s %s",
+                       (timestamp - first_timestamp),
+                       (EndOfTransmissionTimestamp - first_timestamp),
+                       (len?(isResponse ? "Tag" : "Rdr"):"   "),
+                       line, crc);
 
-    prev = timestamp;
-    i += (len + 9);
-  }
+       }
        return 0;
 }
 
@@ -167,7 +187,7 @@ int CmdHF14AReader(const char *Cmd)
        SendCommand(&c);
 
        UsbCommand resp;
-  WaitForResponse(CMD_ACK,&resp);
+       WaitForResponse(CMD_ACK,&resp);
        
        iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;
 
@@ -183,13 +203,12 @@ int CmdHF14AReader(const char *Cmd)
        switch (card->sak) {
                case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
-
-               case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k"); break;
+               case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
                case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
-               case 0x10: PrintAndLog("TYPE : NXP MIFARE Plus 2k"); break;
-               case 0x11: PrintAndLog("TYPE : NXP MIFARE Plus 4k"); break;
-               case 0x18: PrintAndLog("TYPE : NXP MIFARE Classic 4k | Plus 4k"); break;
-               case 0x20: PrintAndLog("TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k | JCOP 31/41"); break;
+               case 0x10: PrintAndLog("TYPE : NXP MIFARE Plus 2k SL2"); break;
+               case 0x11: PrintAndLog("TYPE : NXP MIFARE Plus 4k SL2"); break;
+               case 0x18: PrintAndLog("TYPE : NXP MIFARE Classic 4k | Plus 4k SL1"); break;
+               case 0x20: PrintAndLog("TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41"); break;
                case 0x24: PrintAndLog("TYPE : NXP MIFARE DESFire | DESFire EV1"); break;
                case 0x28: PrintAndLog("TYPE : JCOP31 or JCOP41 v2.3.1"); break;
                case 0x38: PrintAndLog("TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
@@ -316,7 +335,7 @@ int CmdHF14AReader(const char *Cmd)
                }
        } else {
                PrintAndLog("proprietary non iso14443a-4 card found, RATS not supported");
-  }
+       }
 
        return resp.arg[0];
 }
@@ -337,8 +356,8 @@ int CmdHF14ACUIDs(const char *Cmd)
                UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
                SendCommand(&c);
     
-    UsbCommand resp;
-    WaitForResponse(CMD_ACK,&resp);
+               UsbCommand resp;
+               WaitForResponse(CMD_ACK,&resp);
 
                uint8_t *uid  = resp.d.asBytes;
                iso14a_card_select_t *card = (iso14a_card_select_t *)(uid + 12);
@@ -407,10 +426,6 @@ int CmdHF14ASim(const char *Cmd)
                // At lease save the mandatory first part of the UID
                c.arg[0] = long_uid & 0xffffffff;
 
-       
-       // At lease save the mandatory first part of the UID
-       c.arg[0] = long_uid & 0xffffffff;
-       
        if (c.arg[1] == 0) {
                PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
        }
@@ -478,19 +493,22 @@ int CmdHF14ACmdRaw(const char *cmd) {
     uint8_t active=0;
     uint8_t active_select=0;
     uint16_t numbits=0;
+       uint16_t timeout=0;
+       uint8_t bTimeout=0;
     char buf[5]="";
     int i=0;
-    uint8_t data[100];
+    uint8_t data[USB_CMD_DATA_SIZE];
     unsigned int datalen=0, temp;
 
     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("       -t    timeout");
         return 0;
     }
 
@@ -523,6 +541,14 @@ int CmdHF14ACmdRaw(const char *cmd) {
                     while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
                     i-=2;
                     break;
+                               case 't':
+                                       bTimeout=1;
+                                       sscanf(cmd+i+2,"%d",&temp);
+                                       timeout = temp & 0xFFFF;
+                                       i+=3;
+                                       while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
+                                       i+=2;
+                                       break;
                 default:
                     PrintAndLog("Invalid option");
                     return 0;
@@ -540,15 +566,19 @@ int CmdHF14ACmdRaw(const char *cmd) {
             if (strlen(buf)>=2) {
                 sscanf(buf,"%x",&temp);
                 data[datalen]=(uint8_t)(temp & 0xff);
-                datalen++;
                 *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;
     }
-    if(crc && datalen>0)
+    if(crc && datalen>0 && datalen<sizeof(data)-2)
     {
         uint8_t first, second;
         ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
@@ -562,13 +592,22 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if(active)
             c.arg[0] |= ISO14A_NO_SELECT;
     }
+       if(bTimeout){
+           #define MAX_TIMEOUT 624*105 // max timeout is 624 ms
+        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(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);
Impressum, Datenschutz