More annotations to iso14443b protocol listings

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 20ca057b3846629e62d75320b22da4881f040c87..0f31da4d66228550ab02890224206e735139882a 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -158,9 +158,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
@@ -288,13 +307,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;
        }
 
 }
@@ -413,15 +452,18 @@ uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, boo
        if (tracepos + data_len + parity_len >= TRACE_SIZE) {
                return TRACE_SIZE;
        }
-
        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;
 
@@ -430,11 +472,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
@@ -479,8 +527,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),
@@ -519,9 +567,9 @@ int CmdHFList(const char *Cmd)
        int tlen = param_getstr(Cmd,0,type);
        char param = param_getchar(Cmd, 1);
        bool errors = false;
-       uint8_t protocol = false;
+       uint8_t protocol = 0;
        //Validate params
-       if(tlen == 0 || (strcmp(type, "iclass") != 0 && strcmp(type,"14a") != 0))
+       if(tlen == 0)
        {
                errors = true;
        }
@@ -529,6 +577,25 @@ int CmdHFList(const char *Cmd)
        {
                errors = true;
        }
+       if(!errors)
+       {
+               if(strcmp(type, "iclass") == 0)
+               {
+                       protocol = ICLASS;
+               }else if(strcmp(type, "14a") == 0)
+               {
+                       protocol = ISO_14443A;
+               }
+               else if(strcmp(type, "14b") == 0)
+               {
+                       protocol = ISO_14443B;
+               }else if(strcmp(type,"raw")== 0)
+               {
+                       protocol = -1;//No crc, no annotations
+               }else{
+                       errors = true;
+               }
+       }
 
        if (errors) {
                PrintAndLog("List protocol data in trace buffer.");
@@ -543,20 +610,7 @@ int CmdHFList(const char *Cmd)
                PrintAndLog("example: hf list iclass");
                return 0;
        }
-       if(strcmp(type, "iclass") == 0)
-       {
-               protocol = ICLASS;
-       }else if(strcmp(type, "14a") == 0)
-       {
-               protocol = ISO_14443A;
-       }
-       else if(strcmp(type, "14b") == 0)
-       {
-               protocol = ISO_14443B;
-       }else if(strcmp(type,"raw")== 0)
-       {
-               protocol = -1;//No crc, no annotations
-       }
+
 
        if (param == 'f') {
                showWaitCycles = true;
@@ -567,7 +621,6 @@ int CmdHFList(const char *Cmd)
        uint16_t tracepos = 0;
        GetFromBigBuf(trace, TRACE_SIZE, 0);
        WaitForResponse(CMD_ACK, NULL);
-
        PrintAndLog("Recorded Activity");
        PrintAndLog("");
        PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");