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

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

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 2bedad8dcfb6a8d75e49c652bed05334445e0ad4..0ba788d7de39c0daa6ffb726784c47dbea9c06ce 100644 (file)
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -1,15 +1,23 @@
 /*****************************************************************************
 /*****************************************************************************

- * 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
  * Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
  * Milosch Meriac in the paper "Dismantling IClass".
  *
  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by
  * Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
  * Milosch Meriac in the paper "Dismantling IClass".
  *

- * This is a reference implementation of iclass key diversification. I'm sure it can be
- * optimized heavily. It is written for ease of understanding and correctness, please take it
- * and tweak it and make a super fast version instead, using this for testing and verification.
-

  * Copyright (C) 2014 Martin Holst Swende
  *
  * This is free software: you can redistribute it and/or modify
  * Copyright (C) 2014 Martin Holst Swende
  *
  * This is free software: you can redistribute it and/or modify


@@ -22,8 +30,12 @@
  * 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/>.
+ * 
+ * 
+ * 

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

+

 /**
 
 
 /**
 
 


@@ -390,8 +402,8 @@ void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
        des_crypt_ecb(&ctx_enc,csn, crypted_csn);
 
        //Calculate HASH0(DES))
        des_crypt_ecb(&ctx_enc,csn, crypted_csn);
 
        //Calculate HASH0(DES))

-        uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
-       uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);
+    uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
+    //uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);

 
        hash0(crypt_csn,div_key);
 }
 
        hash0(crypt_csn,div_key);
 }


@@ -725,16 +737,22 @@ int doTestsWithKnownInputs()
 
 int readKeyFile(uint8_t key[8])
 {
 
 int readKeyFile(uint8_t key[8])
 {

-

        FILE *f;
        FILE *f;

-
+       int retval = 1;

        f = fopen("iclass_key.bin", "rb");
        f = fopen("iclass_key.bin", "rb");

-       if (f)
-       {
-               if(fread(key, sizeof(key), 1, f) == 1) return 0;
+       if (!f) {
+               return 0;

        }
        }

-       return 1;
-
+       
+       size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
+       if ( bytes_read == 1) {
+               retval = 0;     
+       }
+       if (f) {
+               fclose(f);
+               f = NULL;
+       }
+       return retval;

 }
 
 
 }
 
 


@@ -744,11 +762,9 @@ int doKeyTests(uint8_t debuglevel)
 
        prnlog("[+] Checking if the master key is present (iclass_key.bin)...");
        uint8_t key[8] = {0};
 
        prnlog("[+] Checking if the master key is present (iclass_key.bin)...");
        uint8_t key[8] = {0};

-       if(readKeyFile(key))
-       {
+       if(readKeyFile(key)) {

                prnlog("[+] Master key not present, will not be able to do all testcases");
                prnlog("[+] Master key not present, will not be able to do all testcases");

-       }else
-       {
+       } else {

 
                //Test if it's the right key...
                uint8_t i;
 
                //Test if it's the right key...
                uint8_t i;