lf hid fskdemod bug

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 729a387527a1f10d8802bce474c829b50723fdc5..07a8750f7d20e3b9a3131003276136892ed7824a 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -388,7 +388,7 @@ static void ChkBitstream(const char *str)
     }
   }
 }
     }
   }
 }

-
+//appears to attempt to simulate manchester

 int CmdLFSim(const char *Cmd)
 {
        int i,j;
 int CmdLFSim(const char *Cmd)
 {
        int i,j;


@@ -578,26 +578,41 @@ int CmdLFfind(const char *Cmd)
   }
 
   PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
   }
 
   PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");

-  PrintAndLog("Checking for known tags:");
+  PrintAndLog("\nChecking for known tags:\n");

   ans=CmdFSKdemodIO("");
   if (ans>0) {
   ans=CmdFSKdemodIO("");
   if (ans>0) {

-    PrintAndLog("Valid IO Prox ID Found!");
+    PrintAndLog("\nValid IO Prox ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodPyramid("");
+  if (ans>0) {
+    PrintAndLog("\nValid Pyramid ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodParadox("");
+  if (ans>0) {
+    PrintAndLog("\nValid Paradox ID Found!");
+    return 1;
+  }
+  ans=CmdFSKdemodAWID("");
+  if (ans>0) {
+    PrintAndLog("\nValid AWID ID Found!");

     return 1;
   }
   ans=CmdFSKdemodHID("");
   if (ans>0) {
     return 1;
   }
   ans=CmdFSKdemodHID("");
   if (ans>0) {

-    PrintAndLog("Valid HID Prox ID Found!");
+    PrintAndLog("\nValid HID Prox ID Found!");

     return 1;
   }
   //add psk and indala
     return 1;
   }
   //add psk and indala

-  ans=CmdIndalaDecode("0");
+  ans=CmdIndalaDecode("");

   if (ans>0) {
   if (ans>0) {

-    PrintAndLog("Valid Indala ID Found!");
+    PrintAndLog("\nValid Indala ID Found!");

     return 1;
   }
   ans=Cmdaskmandemod("");
   if (ans>0) {
     return 1;
   }
   ans=Cmdaskmandemod("");
   if (ans>0) {

-    PrintAndLog("Valid EM410x ID Found!");
+    PrintAndLog("\nValid EM410x ID Found!");

     return 1;
   }
   PrintAndLog("No Known Tags Found!\n");
     return 1;
   }
   PrintAndLog("No Known Tags Found!\n");