X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5b59bf20c73825e3732185d74142c8b955e68758..4a7415c8686109bddc8e29ca5c66ce4979b959f8:/client/cmdhf.c diff --git a/client/cmdhf.c b/client/cmdhf.c index d7a52f6b..be842a34 100644 --- a/client/cmdhf.c +++ b/client/cmdhf.c @@ -225,7 +225,10 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){ } // R-block (ack) else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) { - snprintf(exp, size, "R-block"); + if ( (cmd[0] & 0x10) == 0 ) + snprintf(exp, size, "R-block ACK"); + else + snprintf(exp, size, "R-block NACK"); } // I-block else { @@ -528,7 +531,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]; - if (protocol != ISO_14443B && isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) { + if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) { snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]); } else { @@ -599,73 +602,83 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui return tracepos; } +int usage_hf_list(){ + PrintAndLog("List protocol data in trace buffer."); + PrintAndLog("Usage: hf list [f][c]"); + PrintAndLog(" f - show frame delay times as well"); + PrintAndLog(" c - mark CRC bytes"); + PrintAndLog("Supported 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 "); + 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 sample pairs"); + PrintAndLog(" - skip number of triggers"); + PrintAndLog(""); + PrintAndLog("example: hf snoop"); + PrintAndLog(" hf snoop 1000 0"); + return 0; +} int CmdHFList(const char *Cmd) { 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; - //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 [f][c]"); - PrintAndLog(" f - show frame delay times as well"); - PrintAndLog(" c - mark CRC bytes"); - PrintAndLog("Supported 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; @@ -707,9 +720,13 @@ int CmdHFList(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(""); - ans = CmdHF14AReader("s"); + int ans = CmdHF14AReader("s"); + if (ans > 0) { PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n"); return ans; @@ -733,6 +750,19 @@ int CmdHFSearch(const char *Cmd){ return 0; } +int CmdHFSnoop(const char *Cmd) +{ + 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}}; + SendCommand(&c); + return 0; +} + static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, @@ -749,17 +779,17 @@ static command_t CommandTable[] = {"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, " Generic LF/HF Snoop in Testing stage"}, {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; }