added cmdhflist file

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 453635b75adb58e1bb19726214b1e79baf66b35d..34d95c50028b93e60016ac6d54226e4dff0b9e0e 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+// Merlok - 2017
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -30,6 +31,8 @@
 #include "cmdhfmfu.h"
 #include "cmdhftopaz.h"
 #include "protocols.h"
+#include "emv/cmdemv.h"
+#include "cmdhflist.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -465,6 +468,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        case TOPAZ:
                                crcStatus = iso14443B_CRC_check(isResponse, frame, data_len); 
                                break;
+                       case PROTO_MIFARE:
                        case ISO_14443A:
                                crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
                                break;
@@ -517,6 +521,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        {
                switch(protocol) {
                        case ICLASS:            annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
+                       case PROTO_MIFARE:
                        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;
@@ -582,6 +587,8 @@ int CmdHFList(const char *Cmd)
        if(!errors) {
                if(strcmp(type, "iclass") == 0) {
                        protocol = ICLASS;
+               } else if(strcmp(type, "mf") == 0) {
+                       protocol = PROTO_MIFARE;
                } else if(strcmp(type, "14a") == 0) {
                        protocol = ISO_14443A;
                } else if(strcmp(type, "14b") == 0)     {
@@ -603,6 +610,7 @@ int CmdHFList(const char *Cmd)
                PrintAndLog("Supported <protocol> values:");
                PrintAndLog("    raw    - just show raw data without annotations");
                PrintAndLog("    14a    - interpret data as iso14443a communications");
+               PrintAndLog("    mf     - interpret data as iso14443a communications and decrypt crypto1 stream");
                PrintAndLog("    14b    - interpret data as iso14443b communications");
                PrintAndLog("    iclass - interpret data as iclass communications");
                PrintAndLog("    topaz  - interpret data as topaz communications");
@@ -703,6 +711,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... }"},