FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method....

[proxmark3-svn] / client / loclass / main.c

diff --git a/client/loclass/main.c b/client/loclass/main.c
index 42019072f831714ca189be97fee500d775f8fecf..95112f7decafe7a79f05c2651d7dd9b2aa848216 100644 (file)
--- a/client/loclass/main.c
+++ b/client/loclass/main.c
@@ -1,5 +1,17 @@
 /*****************************************************************************
 /*****************************************************************************

- * This file is part of iClassCipher. It is a reconstructon of the cipher engine
+ * WARNING
+ *
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
+ * 
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
+ * 
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ *
+ *****************************************************************************
+ *
+ * This file is part of loclass. It is a reconstructon of the cipher engine

  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by
  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by


@@ -18,11 +30,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with IClassCipher.  If not, see <http://www.gnu.org/licenses/>.
+ * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * 

  ****************************************************************************/
 
  ****************************************************************************/
 

+

 #include <stdio.h>
 #include <stdio.h>

-#include <cipherutils.h>

 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>


@@ -40,17 +55,21 @@ int unitTests()
        errors += testMAC();
        errors += doKeyTests(0);
        errors += testElite();
        errors += testMAC();
        errors += doKeyTests(0);
        errors += testElite();

+    if(errors)
+    {
+        prnlog("OBS! There were errors!!!");
+    }

        return errors;
 }
 int showHelp()
 {
        return errors;
 }
 int showHelp()
 {

-       prnlog("Usage: iclazz [options]");
+    prnlog("Usage: loclass [options]");

        prnlog("Options:");
        prnlog("-t                 Perform self-test");
        prnlog("-h                 Show this help");
        prnlog("-f <filename>      Bruteforce iclass dumpfile");
        prnlog("                   An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses");
        prnlog("Options:");
        prnlog("-t                 Perform self-test");
        prnlog("-h                 Show this help");
        prnlog("-f <filename>      Bruteforce iclass dumpfile");
        prnlog("                   An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses");

-       prnlog("                   The the binary format of the file is expected to be as follows: ");
+       prnlog("                   The binary format of the file is expected to be as follows: ");

        prnlog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
        prnlog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
        prnlog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
        prnlog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
        prnlog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
        prnlog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");


@@ -64,7 +83,18 @@ int main (int argc, char **argv)
 {
        prnlog("IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
        prnlog("Comes with ABSOLUTELY NO WARRANTY");
 {
        prnlog("IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
        prnlog("Comes with ABSOLUTELY NO WARRANTY");

-       prnlog("This is free software, and you are welcome to use, abuse and repackage, please keep the credits\n");
+       prnlog("Released as GPLv2\n");
+       prnlog("WARNING");
+       prnlog("");
+       prnlog("THIS TOOL IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. ");
+       prnlog("");
+       prnlog("USAGE OF THIS TOOL IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL ");
+       prnlog("PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, ");
+       prnlog("AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. ");
+       prnlog("");
+       prnlog("THIS TOOL SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. ");
+
+

        char *fileName = NULL;
        int c;
        while ((c = getopt (argc, argv, "thf:")) != -1)
        char *fileName = NULL;
        int c;
        while ((c = getopt (argc, argv, "thf:")) != -1)