Add @Iceman1001 s cotag read

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 016f0fe288ba5ca051916d5a775fb009594178d2..34104518f9df43b3680cea1314968575c4c0f99d 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -33,12 +33,14 @@
 #include "cmdlfpcf7931.h"// for pcf7931 menu
 #include "cmdlfpyramid.h"// for pyramid menu
 #include "cmdlfviking.h" // for viking menu
 #include "cmdlfpcf7931.h"// for pcf7931 menu
 #include "cmdlfpyramid.h"// for pyramid menu
 #include "cmdlfviking.h" // for viking menu

+#include "cmdlfcotag.h"  // for COTAG menu
+

 
 static int CmdHelp(const char *Cmd);
 
 
 
 
 static int CmdHelp(const char *Cmd);
 
 
 

-int usage_lf_cmdread()
+int usage_lf_cmdread(void)

 {
        PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");
        PrintAndLog("Options:        ");
 {
        PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");
        PrintAndLog("Options:        ");


@@ -430,7 +432,7 @@ int CmdIndalaClone(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int usage_lf_read()
+int usage_lf_read(void)

 {
        PrintAndLog("Usage: lf read");
        PrintAndLog("Options:        ");
 {
        PrintAndLog("Usage: lf read");
        PrintAndLog("Options:        ");


@@ -440,7 +442,7 @@ int usage_lf_read()
        PrintAndLog("Use 'lf config' to set parameters.");
        return 0;
 }
        PrintAndLog("Use 'lf config' to set parameters.");
        return 0;
 }

-int usage_lf_snoop()
+int usage_lf_snoop(void)

 {
        PrintAndLog("Usage: lf snoop");
        PrintAndLog("Options:        ");
 {
        PrintAndLog("Usage: lf snoop");
        PrintAndLog("Options:        ");


@@ -450,7 +452,7 @@ int usage_lf_snoop()
        return 0;
 }
 
        return 0;
 }
 

-int usage_lf_config()
+int usage_lf_config(void)

 {
        PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
        PrintAndLog("Options:        ");
 {
        PrintAndLog("Usage: lf config [H|<divisor>] [b <bps>] [d <decim>] [a 0|1]");
        PrintAndLog("Options:        ");


@@ -685,7 +687,7 @@ int usage_lf_simpsk(void)
        return 0;
 }
 
        return 0;
 }
 

-// by marshmellow - sim ask data given clock, fcHigh, fcLow, invert 
+// by marshmellow - sim fsk data given clock, fcHigh, fcLow, invert 

 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd)
 {
 // - allow pull data from DemodBuffer
 int CmdLFfskSim(const char *Cmd)
 {


@@ -1080,6 +1082,7 @@ int CmdVchDemod(const char *Cmd)
 int CmdLFfind(const char *Cmd)
 {
        int ans=0;
 int CmdLFfind(const char *Cmd)
 {
        int ans=0;

+       size_t minLength = 1000;

        char cmdp = param_getchar(Cmd, 0);
        char testRaw = param_getchar(Cmd, 1);
        if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {
        char cmdp = param_getchar(Cmd, 0);
        char testRaw = param_getchar(Cmd, 1);
        if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {


@@ -1098,7 +1101,7 @@ int CmdLFfind(const char *Cmd)
        if (!offline && (cmdp != '1')){
                CmdLFRead("s");
                getSamples("30000",false);
        if (!offline && (cmdp != '1')){
                CmdLFRead("s");
                getSamples("30000",false);

-       } else if (GraphTraceLen < 1000) {
+       } else if (GraphTraceLen < minLength) {

                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
        }
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
        }


@@ -1108,6 +1111,24 @@ int CmdLFfind(const char *Cmd)
        PrintAndLog("False Positives ARE possible\n");  
        PrintAndLog("\nChecking for known tags:\n");
 
        PrintAndLog("False Positives ARE possible\n");  
        PrintAndLog("\nChecking for known tags:\n");
 

+       size_t testLen = minLength;
+       // only run if graphbuffer is just noise as it should be for hitag/cotag
+       if (graphJustNoise(GraphBuffer, testLen)) {
+               // only run these tests if we are in online mode 
+               if (!offline && (cmdp != '1')){
+                       ans=CmdLFHitagReader("26");
+                       if (ans==0) {
+                               return 1;
+                       }
+                       ans=CmdCOTAGRead("");
+                       if (ans>0){
+                               PrintAndLog("\nValid COTAG ID Found!");
+                               return 1;
+                       }
+               }
+               return 0;
+       }
+

        ans=CmdFSKdemodIO("");
        if (ans>0) {
                PrintAndLog("\nValid IO Prox ID Found!");
        ans=CmdFSKdemodIO("");
        if (ans>0) {
                PrintAndLog("\nValid IO Prox ID Found!");


@@ -1217,6 +1238,7 @@ static command_t CommandTable[] =
 {
        {"help",        CmdHelp,            1, "This help"},
        {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...    }"},
 {
        {"help",        CmdHelp,            1, "This help"},
        {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...    }"},

+       {"cotag",       CmdLFCOTAG,         1, "{ COTAG RFIDs...   }"},

        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs...    }"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs...     }"},
        {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
        {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs...    }"},
        {"hid",         CmdLFHID,           1, "{ HID RFIDs...     }"},
        {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},