FIX: lf hitag : Mea culpa, simulation should not have reader_field on. thanks to...

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index bc8d2ecccd8f2a861c7b01fe9bcfef185c92f200..0ca601fb34e6be5db3a0286c2207444205dcbb46 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -19,12 +19,13 @@
 #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);
@@ -372,6 +373,7 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 // Quite simpel tag
 void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){     
        uint8_t bitsend = cmd[0];       
+       uint8_t cmdBit = (cmd[1] & 1);
        switch (bitsend){
                case 7:
                        snprintf(exp, size, "IV 0x%02X", cmd[1]);
@@ -388,7 +390,7 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
                }
                case 9:
                case 11: {
-                       uint8_t cmdBit = (cmd[1] & 1);
+
                        uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;
                        
                        if (cmdBit == LEGIC_READ) 
@@ -398,6 +400,22 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
                                snprintf(exp, size, "WRITE Byte(%d)", address);
                        break;
                }
+               case 21: {
+                       if (cmdBit == LEGIC_WRITE ) {
+                               uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0xFF;
+                               uint8_t val = (cmd[3] & 1 ) << 7 | cmd[2] >> 1;
+                               snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+                       }
+                       break;
+               }
+               case 23: {
+                       if (cmdBit == LEGIC_WRITE ) {
+                               uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0x3FF;
+                               uint8_t val = (cmd[3] & 0x7 ) << 5 | cmd[2] >> 3;
+                               snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+                       }
+                       break;
+               }
                case 12:
                default:
                        break;
@@ -857,35 +875,34 @@ int CmdHFSearch(const char *Cmd){
        
        PrintAndLog("");
        int ans = CmdHF14AReader("s");
-
        if (ans > 0) {
                PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
                return ans;
        } 
-       ans = CmdHF14BReader("s");
+       ans = HF14BReader(false); //CmdHF14BReader("s");
        if (ans) {
                PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
                return ans;
        }
-       ans = HFiClassReader("", false, false);
-       if (ans) {
-               PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
-               return ans;
-       }
        ans = HF15Reader("", false);
        if (ans) {
                PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
                return ans;
        }
+       ans = HFLegicReader("", false);
+       if ( ans == 0) {
+               PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
+               return 1;
+       }
        ans = CmdHFTopazReader("s");
        if (ans == 0) {
                PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
                return 1;
        }
-       ans = HFLegicReader("", false);
-       if ( ans == 0) {
-               PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
-               return 1;
+       ans = HFiClassReader("", false, false);
+       if (ans) {
+               PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
+               return ans;
        }
        
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
@@ -911,6 +928,9 @@ static command_t CommandTable[] = {
        {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
        {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
        {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
+#ifdef WITH_EMV
+       {"emv",         CmdHFEmv,         1, "{ EMV RFIDs... }"},
+#endif 
        {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs... }"},
        {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
        {"mf",          CmdHFMF,                  1, "{ MIFARE RFIDs... }"},