ADD: ISO7816-4 annotation in "hf list".

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 614dcdc4460e98bf7ed5b90de015970cfe6c10ea..745d2829191836af54f263b250b2d757eea49695 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -36,6 +36,7 @@ int CmdHFTune(const char *Cmd)
   return 0;
 }
 
+
 void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
        switch(cmd[0])
@@ -92,7 +93,6 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                else
                        snprintf(exp,size,"PWD-AUTH");
                break;
-
        case MIFARE_ULEV1_FASTREAD : {
                if ( cmdsize >=3 && cmd[2] <= 0xE6)
                        snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]); 
@@ -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,34 @@ 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;
        }
 }
 
+void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
+
+       int pos = (cmd[0] == 2 ||  cmd[0] == 3) ? 1 : 2;
+
+       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 +246,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 +486,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;
                }
@@ -483,11 +507,13 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
                uint8_t parityBits = parityBytes[j>>3];
-               if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+               if (protocol != ISO_14443B && isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
+
                } else {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
                }
+
        }
 
        if (markCRCBytes) {
@@ -515,6 +541,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;
                }
        }
@@ -583,6 +610,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{
@@ -601,6 +630,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");
@@ -663,6 +693,11 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
                return ans;
        } 
+       ans = HF14BInfo(false);
+       if (ans) {
+               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+               return ans;
+       }
        ans = HFiClassReader("", false, false);
        if (ans) {
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
@@ -673,12 +708,7 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
                return ans;
        }
-
-
-       //14b has issues currently...
-       //ans = CmdHF14BRead(Cmd);
-       //if (ans > 0) return ans;
-
+       PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
        return 0;
 }