ADD: 'hf emv' - from @peterfillmore emv fork. A bit cleaned up and moved around...

diff --git a/client/Makefile b/client/Makefile
index 0053d8e583b024a1c6f28d181d87d1d2ed9d3d3d..a56fd35bc56944b41e00c589b7604e71bccd14b8 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -122,6 +122,7 @@ CMDSRCS =   mifarehost.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \

+                       cmdhfemv.c \

                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 031f065ea99c35b0b463c40dfd057426789720fe..e41013b58a954cd1d9be719600d3652ed4eebcba 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -19,12 +19,13 @@
 #include "cmdhf14b.h"
 #include "cmdhf15.h"
 #include "cmdhfepa.h"
 #include "cmdhf14b.h"
 #include "cmdhf15.h"
 #include "cmdhfepa.h"

-#include "cmdhflegic.h"
-#include "cmdhficlass.h"
-#include "cmdhfmf.h"
-#include "cmdhfmfu.h"
-#include "cmdhfmfdes.h"
-#include "cmdhftopaz.h"
+#include "cmdhflegic.h"         // LEGIC
+#include "cmdhficlass.h" // ICLASS
+#include "cmdhfmf.h"    // CLASSIC
+#include "cmdhfmfu.h"   // ULTRALIGHT/NTAG etc
+#include "cmdhfmfdes.h"         // DESFIRE
+#include "cmdhftopaz.h"         // TOPAZ
+#include "cmdhfemv.h"   // EMV

 #include "protocols.h"
 
 static int CmdHelp(const char *Cmd);
 #include "protocols.h"
 
 static int CmdHelp(const char *Cmd);


@@ -927,6 +928,7 @@ static command_t CommandTable[] = {
        {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
        {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
        {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
        {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
        {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
        {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},

+       {"emv",         CmdHFEmv,         1, "{ EMV RFIDs... }"},

        {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs... }"},
        {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
        {"mf",          CmdHFMF,                  1, "{ MIFARE RFIDs... }"},
        {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs... }"},
        {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
        {"mf",          CmdHFMF,                  1, "{ MIFARE RFIDs... }"},

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 2600d937c75275a8b2a2b26bddce44ff14aac3aa..6d338d0dec25b1712d1dd386c0a14d8af91d33b0 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // 2011, Merlok
 //-----------------------------------------------------------------------------
 // 2011, Merlok

+// 2014, Peter Fillmore

 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,


@@ -700,7 +701,8 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
     return 0;
 }
 

-static void waitCmd(uint8_t iSelect) {
+static void waitCmd(uint8_t iSelect)
+{

     UsbCommand resp;
     uint16_t len = 0;
 
     UsbCommand resp;
     uint16_t len = 0;
 

diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 93cbfd8fab1bcd2d5fa919eff1b60010c7473b3d..82fa519752e89d00959487a2f7389d38daae52b7 100644 (file)
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -18,6 +18,7 @@ int CmdHF14AMifare(const char *Cmd);
 int CmdHF14AReader(const char *Cmd);
 int CmdHF14ASim(const char *Cmd);
 int CmdHF14ASniff(const char *Cmd);
 int CmdHF14AReader(const char *Cmd);
 int CmdHF14ASim(const char *Cmd);
 int CmdHF14ASniff(const char *Cmd);

+int CmdHF14AEMVTransaction(const char *Cmd);

 
 char* getTagInfo(uint8_t uid);
 
 
 char* getTagInfo(uint8_t uid);