FIX: A old bug regarding: CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K command, where it...

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 4efa55bf5e06229aa2bf9fdb77399cd04361bee2..91743c465102eba7872c5e911722186fbcff5e6b 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -189,7 +189,6 @@ void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
        }
 }
 
-
 void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
        switch(cmd[0]) {
@@ -204,10 +203,58 @@ void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                case TOPAZ_READ8                                        :snprintf(exp, size, "READ8");break;
                case TOPAZ_WRITE_E8                                     :snprintf(exp, size, "WRITE-E8");break;
                case TOPAZ_WRITE_NE8                            :snprintf(exp, size, "WRITE-NE8");break;
-               default:                            snprintf(exp,size,"?"); break;
+               default                                                         :snprintf(exp,size,"?"); break;
        }
 }
 
+// iso 7816-3 
+void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+       // S-block
+       if ( (cmd[0] & 0xC0) && (cmdsize == 3) ) {              
+               switch ( (cmd[0] & 0x3f)  ) {
+                       case 0x00       : snprintf(exp, size, "S-block RESYNCH req"); break;
+                       case 0x20       : snprintf(exp, size, "S-block RESYNCH resp"); break;
+                       case 0x01       : snprintf(exp, size, "S-block IFS req"); break;
+                       case 0x21       : snprintf(exp, size, "S-block IFS resp"); break;
+                       case 0x02       : snprintf(exp, size, "S-block ABORT req"); break;
+                       case 0x22       : snprintf(exp, size, "S-block ABORT resp"); break;
+                       case 0x03       : snprintf(exp, size, "S-block WTX reqt"); break;
+                       case 0x23       : snprintf(exp, size, "S-block WTX resp"); break;
+                       default         : snprintf(exp, size, "S-block"); break;
+               }               
+       }
+       // R-block (ack)
+       else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
+               if ( (cmd[0] & 0x10) == 0 ) 
+                       snprintf(exp, size, "R-block ACK");
+               else
+                       snprintf(exp, size, "R-block NACK");
+       }
+       // I-block
+       else {
+
+               int pos = (cmd[0] == 2 ||  cmd[0] == 3) ? 2 : 3;
+               switch ( cmd[pos] ){
+                       case ISO7816_READ_BINARY                                :snprintf(exp, size, "READ BIN");break;
+                       case ISO7816_WRITE_BINARY                               :snprintf(exp, size, "WRITE BIN");break;
+                       case ISO7816_UPDATE_BINARY                              :snprintf(exp, size, "UPDATE BIN");break;
+                       case ISO7816_ERASE_BINARY                               :snprintf(exp, size, "ERASE BIN");break;
+                       case ISO7816_READ_RECORDS                               :snprintf(exp, size, "READ RECORDS");break;
+                       case ISO7816_WRITE_RECORDS                              :snprintf(exp, size, "WRITE RECORDS");break;
+                       case ISO7816_APPEND_RECORD                              :snprintf(exp, size, "APPEND RECORD");break;
+                       case ISO7816_UPDATE_RECORD                              :snprintf(exp, size, "UPDATE RECORD");break;
+                       case ISO7816_GET_DATA                                   :snprintf(exp, size, "GET DATA");break;
+                       case ISO7816_PUT_DATA                                   :snprintf(exp, size, "PUT DATA");break;
+                       case ISO7816_SELECT_FILE                                :snprintf(exp, size, "SELECT FILE");break;
+                       case ISO7816_VERIFY                                             :snprintf(exp, size, "VERIFY");break;
+                       case ISO7816_INTERNAL_AUTHENTICATION    :snprintf(exp, size, "INTERNAL AUTH");break;
+                       case ISO7816_EXTERNAL_AUTHENTICATION    :snprintf(exp, size, "EXTERNAL AUTH");break;
+                       case ISO7816_GET_CHALLENGE                              :snprintf(exp, size, "GET CHALLENGE");break;
+                       case ISO7816_MANAGE_CHANNEL                             :snprintf(exp, size, "MANAGE CHANNEL");break;
+                       default                                                                 :snprintf(exp,size,"?"); break;
+               }
+       }
+}
 
 /**
 06 00 = INITIATE
@@ -223,20 +270,21 @@ void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 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;
-       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;
+               case ISO14443B_REQB             : snprintf(exp,size,"REQB");break;
+               case ISO14443B_ATTRIB           : snprintf(exp,size,"ATTRIB");break;
+               case ISO14443B_HALT             : snprintf(exp,size,"HALT");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;
+               case ISO14443B_PING                     : snprintf(exp,size,"PING");break;
+               case ISO14443B_PONG                     : snprintf(exp,size,"PONG");break;
+               default                     : snprintf(exp,size ,"?");break;
        }
-
 }
 
 /**
@@ -462,7 +510,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                                break;
                        case ISO_14443A:
                                crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
-                               break;
+                               break;                          
                        default: 
                                break;
                }
@@ -517,6 +565,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        case ISO_14443A:        annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
                        case ISO_14443B:        annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
                        case TOPAZ:                     annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
+                       case ISO_7816_4:        annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
                        default:                        break;
                }
        }
@@ -585,6 +634,8 @@ int CmdHFList(const char *Cmd)
                        protocol = ISO_14443B;
                } else if(strcmp(type,"topaz")== 0) {
                        protocol = TOPAZ;
+               } else if(strcmp(type,"7816")== 0) {
+                       protocol = ISO_7816_4;                  
                } else if(strcmp(type,"raw")== 0) {
                        protocol = -1;//No crc, no annotations
                }else{
@@ -603,6 +654,7 @@ int CmdHFList(const char *Cmd)
                PrintAndLog("    14b    - interpret data as iso14443b communications");
                PrintAndLog("    iclass - interpret data as iclass communications");
                PrintAndLog("    topaz  - interpret data as topaz communications");
+               PrintAndLog("    7816   - interpret data as iso7816-4 communications");
                PrintAndLog("");
                PrintAndLog("example: hf list 14a f");
                PrintAndLog("example: hf list iclass");
@@ -665,7 +717,7 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
                return ans;
        } 
-       ans = HF14BReader(false);
+       ans = HF14BInfo(false);
        if (ans) {
                PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
                return ans;
@@ -699,7 +751,7 @@ static command_t CommandTable[] =
   {"topaz",                    CmdHFTopaz,             1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
   {"tune",                     CmdHFTune,      0, "Continuously measure HF antenna tuning"},
   {"list",        CmdHFList,        1, "List protocol data in trace buffer"},
-  {"search",      CmdHFSearch,      1, "Search for known HF tags"},
+  {"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
        {NULL, NULL, 0, NULL}
 };