Merge branch 'master' of https://github.com/Proxmark/proxmark3

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

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index a55227efd440948152a9e4478ddb97692e7aef92..b21ecdbc028f96bdc0ae95cc08f65d9f7c7c6099 100644 (file)
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -403,7 +403,7 @@ void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
 
        //Calculate HASH0(DES))
     uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
 
        //Calculate HASH0(DES))
     uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);

-       uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);
+    //uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);

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


@@ -742,7 +742,11 @@ int readKeyFile(uint8_t key[8])
        f = fopen("iclass_key.bin", "rb");
        if (f)
        {
        f = fopen("iclass_key.bin", "rb");
        if (f)
        {

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

        }
        return retval;
 }
        }
        return retval;
 }