]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf.c
Merge remote-tracking branch 'upstream/master'
[proxmark3-svn] / client / cmdhf.c
index 637b2b0810d07477dd93e9bb7da2cac3b628954e..7f1246cc36be6e72c691d04857ccf5df6a628c6c 100644 (file)
@@ -32,8 +32,6 @@ int CmdHFTune(const char *Cmd)
   SendCommand(&c);
   return 0;
 }
-// for the time being. Need better Bigbuf handling.
-#define TRACE_SIZE 3000
 
 //The following data is taken from http://www.proxmark.org/forum/viewtopic.php?pid=13501#p13501
 /*
@@ -159,9 +157,28 @@ NXP/Philips CUSTOM COMMANDS
 #define MIFARE_ULC_AUTH_1       0x1A
 #define MIFARE_ULC_AUTH_2        0xAF
 
+/**
+06 00 = INITIATE
+0E xx = SELECT ID (xx = Chip-ID)
+0B = Get UID
+08 yy = Read Block (yy = block number)
+09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)
+0C = Reset to Inventory
+0F = Completion
+0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
+**/
+
 #define ISO14443B_REQB         0x05
 #define ISO14443B_ATTRIB       0x1D
 #define ISO14443B_HALT         0x50
+#define ISO14443B_INITIATE     0x06
+#define ISO14443B_SELECT       0x0E
+#define ISO14443B_GET_UID      0x0B
+#define ISO14443B_READ_BLK     0x08
+#define ISO14443B_WRITE_BLK    0x09
+#define ISO14443B_RESET        0x0C
+#define ISO14443B_COMPLETION   0x0F
+#define ISO14443B_AUTHENTICATE 0x0A
 
 //First byte is 26
 #define ISO15693_INVENTORY     0x01
@@ -194,7 +211,7 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
        case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
                // 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
                // 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
-               if(cmd[2] == 0x70)
+               if(cmd[1] == 0x70)
                {
                        snprintf(exp,size,"SELECT_UID"); break;
                }else
@@ -222,8 +239,8 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
        case MIFARE_CMD_DEC:          snprintf(exp,size,"DEC(%d)",cmd[1]); break;
        case MIFARE_CMD_RESTORE:      snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
        case MIFARE_CMD_TRANSFER:     snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;
-       case MIFARE_AUTH_KEYA:        snprintf(exp,size,"AUTH-A"); break;
-       case MIFARE_AUTH_KEYB:        snprintf(exp,size,"AUTH-B"); break;
+       case MIFARE_AUTH_KEYA:        snprintf(exp,size,"AUTH-A(%d)",cmd[1]); break;
+       case MIFARE_AUTH_KEYB:        snprintf(exp,size,"AUTH-B(%d)",cmd[1]); break;
        case MIFARE_MAGICMODE:        snprintf(exp,size,"MAGIC"); break;
        default:                      snprintf(exp,size,"?"); break;
        }
@@ -289,13 +306,33 @@ void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                }
        }
 }
+
+/**
+06 00 = INITIATE
+0E xx = SELECT ID (xx = Chip-ID)
+0B = Get UID
+08 yy = Read Block (yy = block number)
+09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)
+0C = Reset to Inventory
+0F = Completion
+0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
+**/
+
 void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
        switch(cmd[0]){
        case ISO14443B_REQB   : snprintf(exp,size,"REQB");break;
        case ISO14443B_ATTRIB : snprintf(exp,size,"ATTRIB");break;
        case ISO14443B_HALT   : snprintf(exp,size,"HALT");break;
-       default:                snprintf(exp,size ,"?");break;
+       case ISO14443B_INITIATE     : snprintf(exp,size,"INITIATE");break;
+       case ISO14443B_SELECT       : snprintf(exp,size,"SELECT(%d)",cmd[1]);break;
+       case ISO14443B_GET_UID      : snprintf(exp,size,"GET UID");break;
+       case ISO14443B_READ_BLK     : snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break;
+       case ISO14443B_WRITE_BLK    : snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break;
+       case ISO14443B_RESET        : snprintf(exp,size,"RESET");break;
+       case ISO14443B_COMPLETION   : snprintf(exp,size,"COMPLETION");break;
+       case ISO14443B_AUTHENTICATE : snprintf(exp,size,"AUTHENTICATE");break;
+       default                     : snprintf(exp,size ,"?");break;
        }
 
 }
@@ -384,18 +421,18 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
        }
 }
 
-uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, bool showWaitCycles)
+uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles)
 {
        bool isResponse;
-       uint16_t duration, data_len,parity_len;
+       uint16_t duration, data_len, parity_len;
 
        uint32_t timestamp, first_timestamp, EndOfTransmissionTimestamp;
        char explanation[30] = {0};
 
+       if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
+       
        first_timestamp = *((uint32_t *)(trace));
        timestamp = *((uint32_t *)(trace + tracepos));
-       // Break and stick with current result if buffer was not completely full
-       if (timestamp == 0x44444444) return TRACE_SIZE;
 
        tracepos += 4;
        duration = *((uint16_t *)(trace + tracepos));
@@ -411,18 +448,21 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
        }
        parity_len = (data_len-1)/8 + 1;
 
-       if (tracepos + data_len + parity_len >= TRACE_SIZE) {
-               return TRACE_SIZE;
+       if (tracepos + data_len + parity_len > traceLen) {
+               return traceLen;
        }
-
        uint8_t *frame = trace + tracepos;
        tracepos += data_len;
        uint8_t *parityBytes = trace + tracepos;
        tracepos += parity_len;
 
+
        //--- Draw the data column
+       //char line[16][110];
        char line[16][110];
-       for (int j = 0; j < data_len; j++) {
+
+       for (int j = 0; j < data_len && j/16 < 16; j++) {
+
                int oddparity = 0x01;
                int k;
 
@@ -431,11 +471,17 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
                }
 
                uint8_t parityBits = parityBytes[j>>3];
-
                if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
-                       sprintf(line[j/16]+((j%16)*4), "%02x! ", frame[j]);
+                       snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
+
                } else {
-                       sprintf(line[j/16]+((j%16)*4), "%02x  ", frame[j]);
+                       snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
+               }
+       }
+       if(data_len == 0)
+       {
+               if(data_len == 0){
+                       sprintf(line[0],"<empty trace - possible error>");
                }
        }
        //--- Draw the CRC column
@@ -480,8 +526,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
                        annotateIso14443b(explanation,sizeof(explanation),frame,data_len);
        }
 
-       int num_lines = (data_len - 1)/16 + 1;
-       for (int j = 0; j < num_lines; j++) {
+       int num_lines = MIN((data_len - 1)/16 + 1, 16);
+       for (int j = 0; j < num_lines ; j++) {
                if (j == 0) {
                        PrintAndLog(" %9d | %9d | %s | %-64s| %s| %s",
                                (timestamp - first_timestamp),
@@ -498,6 +544,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
                }
        }
 
+       if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
+       
        bool next_isResponse = *((uint16_t *)(trace + tracepos + 6)) & 0x8000;
 
        if (showWaitCycles && !isResponse && next_isResponse) {
@@ -510,9 +558,11 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
                                (next_timestamp - EndOfTransmissionTimestamp));
                }
        }
+
        return tracepos;
 }
 
+
 int CmdHFList(const char *Cmd)
 {
        bool showWaitCycles = false;
@@ -552,12 +602,13 @@ int CmdHFList(const char *Cmd)
 
        if (errors) {
                PrintAndLog("List protocol data in trace buffer.");
-               PrintAndLog("Usage:  hf list [14a|14b|iclass] [f]");
+               PrintAndLog("Usage:  hf list <protocol> [f]");
+               PrintAndLog("    f      - show frame delay times as well");
+               PrintAndLog("Supported <protocol> values:");
+               PrintAndLog("    raw    - just show raw data without annotations");
                PrintAndLog("    14a    - interpret data as iso14443a communications");
                PrintAndLog("    14b    - interpret data as iso14443b communications");
                PrintAndLog("    iclass - interpret data as iclass communications");
-               PrintAndLog("    raw    - just show raw data");
-               PrintAndLog("    f      - show frame delay times as well");
                PrintAndLog("");
                PrintAndLog("example: hf list 14a f");
                PrintAndLog("example: hf list iclass");
@@ -570,12 +621,28 @@ int CmdHFList(const char *Cmd)
        }
 
 
-       uint8_t trace[TRACE_SIZE];
+       uint8_t *trace;
        uint16_t tracepos = 0;
-       GetFromBigBuf(trace, TRACE_SIZE, 0);
-       WaitForResponse(CMD_ACK, NULL);
-
-       PrintAndLog("Recorded Activity");
+       trace = malloc(USB_CMD_DATA_SIZE);
+
+       // Query for the size of the trace
+       UsbCommand response;
+       GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
+       WaitForResponse(CMD_ACK, &response);
+       uint16_t traceLen = response.arg[2];
+       if (traceLen > USB_CMD_DATA_SIZE) {
+               uint8_t *p = realloc(trace, traceLen);
+               if (p == NULL) {
+                       PrintAndLog("Cannot allocate memory for trace");
+                       free(trace);
+                       return 2;
+               }
+               trace = p;
+               GetFromBigBuf(trace, traceLen, 0);
+               WaitForResponse(CMD_ACK, NULL);
+       }
+       
+       PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
        PrintAndLog("");
        PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
        PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
@@ -584,10 +651,12 @@ int CmdHFList(const char *Cmd)
        PrintAndLog("     Start |       End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
        PrintAndLog("-----------|-----------|-----|-----------------------------------------------------------------|-----|--------------------|");
 
-       while(tracepos < TRACE_SIZE)
+       while(tracepos < traceLen)
        {
-               tracepos = printTraceLine(tracepos, trace, protocol, showWaitCycles);
+               tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles);
        }
+
+       free(trace);
        return 0;
 }
 
Impressum, Datenschutz