Merge pull request #488 from pwpiwi/fix_usbpower

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index dcfb1bdd38d98af1b1b8504c386feb5883ea8f12..7a2f3252f368e0648e28b68eaeb693af01a27c21 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -30,6 +30,7 @@
 #include "cmdhfmfu.h"
 #include "cmdhftopaz.h"
 #include "protocols.h"
+#include "emv/cmdemv.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -546,7 +547,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        
        if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
                uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
-               PrintAndLog(" %9d | %9d | %s | fdt (Frame Delay Time): %d",
+               PrintAndLog(" %10d | %10d | %s | fdt (Frame Delay Time): %d",
                        (EndOfTransmissionTimestamp - first_timestamp),
                        (next_timestamp - first_timestamp),
                        "   ",
@@ -562,7 +563,7 @@ int CmdHFList(const char *Cmd)
        bool showWaitCycles = false;
        bool markCRCBytes = false;
        char type[40] = {0};
-       int tlen = param_getstr(Cmd,0,type);
+       int tlen = param_getstr(Cmd,0,type, sizeof(type));
        char param1 = param_getchar(Cmd, 1);
        char param2 = param_getchar(Cmd, 2);
        bool errors = false;
@@ -663,7 +664,7 @@ int CmdHFList(const char *Cmd)
 int CmdHFSearch(const char *Cmd){
        int ans = 0;
        PrintAndLog("");
-       ans = CmdHF14AReader("s");
+       ans = CmdHF14AInfo("s");
        if (ans > 0) {
                PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
                return ans;
@@ -673,14 +674,15 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
                return ans;
        }
-       ans = HF14BInfo(false);
+       ans = HF15Reader("", false);
        if (ans) {
-               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
                return ans;
        }
-       ans = HF15Reader("", false);
+       //14b is longest test currently (and rarest chip type) ... put last
+       ans = HF14BInfo(false);
        if (ans) {
-               PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
                return ans;
        }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
@@ -702,6 +704,7 @@ static command_t CommandTable[] =
        {"14b",         CmdHF14B,               1, "{ ISO14443B RFIDs... }"},
        {"15",          CmdHF15,                1, "{ ISO15693 RFIDs... }"},
        {"epa",         CmdHFEPA,               1, "{ German Identification Card... }"},
+       {"emv",         CmdHFEMV,               1, "{ EMV cards... }"},
        {"legic",       CmdHFLegic,             0, "{ LEGIC RFIDs... }"},
        {"iclass",      CmdHFiClass,    1, "{ ICLASS RFIDs... }"},
        {"mf",          CmdHFMF,                1, "{ MIFARE RFIDs... }"},