]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update README.md
[proxmark3-svn] / client / cmdhf.c
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 745d2829191836af54f263b250b2d757eea49695..a14c2e59f3b922df5ef5b1b245028df9913615f6 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -29,11 +29,12 @@
 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 
-int CmdHFTune(const char *Cmd)
-{
-  UsbCommand c={CMD_MEASURE_ANTENNA_TUNING_HF};
-  SendCommand(&c);
-  return 0;
+int CmdHFTune(const char *Cmd) {
+       PrintAndLog("Measuring HF antenna, press button to exit");
+       UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;
 }
 
 
 }
 
 
@@ -46,23 +47,19 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                // 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[1] == 0x70)
                // 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[1] == 0x70)
-               {
-                       snprintf(exp,size,"SELECT_UID"); break;
-               }else
-               {
-                       snprintf(exp,size,"ANTICOLL"); break;
-               }
+                       snprintf(exp,size,"SELECT_UID");
+               else
+                       snprintf(exp,size,"ANTICOLL");
+               break;
        }
        case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
                //95 20 = Anticollision of cascade level2
                //95 70 = Select of cascade level2
                if(cmd[2] == 0x70)
        }
        case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
                //95 20 = Anticollision of cascade level2
                //95 70 = Select of cascade level2
                if(cmd[2] == 0x70)
-               {
-                       snprintf(exp,size,"SELECT_UID-2"); break;
-               }else
-               {
-                       snprintf(exp,size,"ANTICOLL-2"); break;
-               }
+                       snprintf(exp,size,"SELECT_UID-2");
+               else
+                       snprintf(exp,size,"ANTICOLL-2");
+               break;
        }
        case ISO14443A_CMD_REQA:                snprintf(exp,size,"REQA"); break;
        case ISO14443A_CMD_READBLOCK:   snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
        }
        case ISO14443A_CMD_REQA:                snprintf(exp,size,"REQA"); break;
        case ISO14443A_CMD_READBLOCK:   snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
@@ -207,29 +204,53 @@ void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
        }
 }
 
        }
 }
 
+// iso 7816-3 
 void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
 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;
- }
+       // 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;
+               }
+       }
 }
 
 /**
 }
 
 /**
@@ -246,7 +267,21 @@ void annotateIso7816(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]){
 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_REQB             : {
+                       
+                       switch ( cmd[2] & 0x07 ) {
+                               case 0: snprintf(exp, size,"1 slot ");break;
+                               case 1: snprintf(exp, size,"2 slots ");break; 
+                               case 2: snprintf(exp, size,"4 slots ");break;
+                               case 3: snprintf(exp, size,"8 slots ");break;
+                               default: snprintf(exp, size,"16 slots ");break;
+                       }                       
+                       if ( (cmd[2] & 0x8) )
+                               snprintf(exp, size,"WUPB");
+                       else
+                               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_ATTRIB           : snprintf(exp,size,"ATTRIB");break;
                case ISO14443B_HALT             : snprintf(exp,size,"HALT");break;
                case ISO14443B_INITIATE     : snprintf(exp,size,"INITIATE");break;
@@ -507,7 +542,7 @@ 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];
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
                uint8_t parityBits = parityBytes[j>>3];
-               if (protocol != ISO_14443B && isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+               if (protocol != ISO_14443B && protocol != ISO_7816_4 &&  (isResponse || protocol == ISO_14443A)  && (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]);
 
                } else {
@@ -526,9 +561,10 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                }
        }
 
                }
        }
 
-       if(data_len == 0){
+       if(data_len == 0 )
                sprintf(line[0],"<empty trace - possible error>");
                sprintf(line[0],"<empty trace - possible error>");
-       }
+
+
        //--- Draw the CRC column
        char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
        //--- Draw the CRC column
        char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
@@ -578,73 +614,85 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        return tracepos;
 }
 
        return tracepos;
 }
 
+int usage_hf_list(){
+       PrintAndLog("List protocol data in trace buffer.");
+       PrintAndLog("Usage:  hf list <protocol> [f][c]");
+       PrintAndLog("    f      - show frame delay times as well");
+       PrintAndLog("    c      - mark CRC bytes");
+       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("    topaz  - interpret data as topaz communications");
+       PrintAndLog("    7816   - interpret data as iso7816-4 communications");
+       PrintAndLog("");
+       PrintAndLog("example:   hf list 14a f");
+       PrintAndLog("                   hf list iclass");
+       return 0;
+}
+int usage_hf_search(){
+       PrintAndLog("Usage: hf search");
+       PrintAndLog("Will try to find a HF read out of the unknown tag. Stops when found.");
+       PrintAndLog("Options:");
+       PrintAndLog("       h   - This help");
+       PrintAndLog("");
+       return 0;
+}
+int usage_hf_snoop(){
+       PrintAndLog("Usage: hf snoop <skip pairs> <skip triggers>");
+       PrintAndLog("The high frequence snoop will assign all available memory on device for snooped data");
+       PrintAndLog("User the 'data samples' command to download from device,  and 'data plot' to look at it");
+       PrintAndLog("Press button to quit the snooping.");
+       PrintAndLog("Options:");
+       PrintAndLog("       h                           - This help");
+       PrintAndLog("       <skip pairs>        - skip sample pairs");
+       PrintAndLog("       <skip triggers>     - skip number of triggers");
+       PrintAndLog("");
+       PrintAndLog("example:   hf snoop");
+       PrintAndLog("           hf snoop 1000 0");
+       return 0;
+}
 
 int CmdHFList(const char *Cmd)
 {
 
 int CmdHFList(const char *Cmd)
 {
+       clearCommandBuffer();
+               
        bool showWaitCycles = false;
        bool markCRCBytes = false;
        bool showWaitCycles = false;
        bool markCRCBytes = false;
-       char type[40] = {0};
-       int tlen = param_getstr(Cmd,0,type);
+       char type[10] = {0};
+       //int tlen = param_getstr(Cmd,0,type);
        char param1 = param_getchar(Cmd, 1);
        char param2 = param_getchar(Cmd, 2);
        bool errors = false;
        uint8_t protocol = 0;
        char param1 = param_getchar(Cmd, 1);
        char param2 = param_getchar(Cmd, 2);
        bool errors = false;
        uint8_t protocol = 0;
-       //Validate params
-
-       if(tlen == 0) {
-               errors = true;
-       }
-
-       if(param1 == 'h'
-                       || (param1 != 0 && param1 != 'f' && param1 != 'c')
-                       || (param2 != 0 && param2 != 'f' && param2 != 'c')) {
-               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,"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{
-                       errors = true;
-               }
-       }
 
 
-       if (errors) {
-               PrintAndLog("List protocol data in trace buffer.");
-               PrintAndLog("Usage:  hf list <protocol> [f][c]");
-               PrintAndLog("    f      - show frame delay times as well");
-               PrintAndLog("    c      - mark CRC bytes");
-               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("    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");
-               return 0;
+       //Validate params H or empty
+       if (strlen(Cmd) < 1 || param1 == 'h' || param1 == 'H') return usage_hf_list();
+       
+       //Validate params  F,C
+       if(
+               (param1 != 0 && param1 != 'f' && param1 != 'c') || 
+               (param2 != 0 && param2 != 'f' && param2 != 'c')
+               ) {
+               return usage_hf_list();
        }
 
        }
 
+       param_getstr(Cmd,0,type);
+       
+       // validate type of output
+       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, "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 errors = true;
 
 
-       if (param1 == 'f' || param2 == 'f') {
-               showWaitCycles = true;
-       }
+       if (errors) return usage_hf_list();
 
 
-       if (param1 == 'c' || param2 == 'c') {
-               markCRCBytes = true;
-       }
+       if (param1 == 'f' || param2 == 'f') showWaitCycles = true;
+       if (param1 == 'c' || param2 == 'c') markCRCBytes = true;
 
        uint8_t *trace;
        uint16_t tracepos = 0;
 
        uint8_t *trace;
        uint16_t tracepos = 0;
@@ -686,16 +734,20 @@ int CmdHFList(const char *Cmd)
 }
 
 int CmdHFSearch(const char *Cmd){
 }
 
 int CmdHFSearch(const char *Cmd){
-       int ans = 0;
+
+       char cmdp = param_getchar(Cmd, 0);      
+       if (cmdp == 'h' || cmdp == 'H') return usage_hf_search();
+       
        PrintAndLog("");
        PrintAndLog("");
-       ans = CmdHF14AReader("s");
+       int ans = CmdHF14AReader("s");
+
        if (ans > 0) {
        if (ans > 0) {
-               PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
                return ans;
        } 
                return ans;
        } 
-       ans = HF14BInfo(false);
+       ans = CmdHF14BReader("s");
        if (ans) {
        if (ans) {
-               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
                return ans;
        }
        ans = HFiClassReader("", false, false);
                return ans;
        }
        ans = HFiClassReader("", false, false);
@@ -708,37 +760,55 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
                return ans;
        }
                PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
                return ans;
        }
+       ans = CmdHFTopazReader("s");
+       if (ans == 0) {
+               PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
+               return 1;
+       }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
        return 0;
 }
 
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
        return 0;
 }
 
-static command_t CommandTable[] = 
+int CmdHFSnoop(const char *Cmd)
 {
 {
-  {"help",        CmdHelp,          1, "This help"},
-  {"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs... }"},
-  {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
-  {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
-  {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
-  {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
-  {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
-  {"mf",               CmdHFMF,                1, "{ MIFARE RFIDs... }"},
-  {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs... }"},
-  {"mfdes",                    CmdHFMFDes,             1, "{ MIFARE Desfire RFIDs... }"},
-  {"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 [preliminary]"},
+       char cmdp = param_getchar(Cmd, 0);      
+       if (cmdp == 'h' || cmdp == 'H') return usage_hf_snoop();
+       
+       int skippairs =  param_get32ex(Cmd, 0, 0, 10);
+       int skiptriggers =  param_get32ex(Cmd, 1, 0, 10);
+       
+       UsbCommand c = {CMD_HF_SNIFFER, {skippairs, skiptriggers, 0}};
+       clearCommandBuffer();
+       SendCommand(&c);
+       return 0;
+}
+
+static command_t CommandTable[] = {
+       {"help",        CmdHelp,          1, "This help"},
+       {"14a",         CmdHF14A,         1, "{ ISO14443A RFIDs... }"},
+       {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
+       {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
+       {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
+       {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
+       {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
+       {"mf",          CmdHFMF,                  1, "{ MIFARE RFIDs... }"},
+       {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs... }"},
+       {"mfdes",               CmdHFMFDes,               1, "{ MIFARE Desfire RFIDs... }"},
+       {"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 [preliminary]"},
+       {"snoop",       CmdHFSnoop,       0, "<samples to skip (10000)> <triggers to skip (1)> Generic LF/HF Snoop in Testing stage"},
        {NULL, NULL, 0, NULL}
 };
 
        {NULL, NULL, 0, NULL}
 };
 
-int CmdHF(const char *Cmd)
-{
-  CmdsParse(CommandTable, Cmd);
-  return 0; 
+int CmdHF(const char *Cmd) {
+       clearCommandBuffer();
+       CmdsParse(CommandTable, Cmd);
+       return 0; 
 }
 
 }
 
-int CmdHelp(const char *Cmd)
-{
-  CmdsHelp(CommandTable);
-  return 0;
+int CmdHelp(const char *Cmd) {
+       CmdsHelp(CommandTable);
+       return 0;
 }
 }
Proxmark3 GIT tracking
Impressum, Datenschutz