X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/74a3880283e26a957b61221028792a868daa7f05..4c6f2d48fbe8d57c6fbd80b7e4b38acaf6355e47:/client/loclass/ikeys.c

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 2bedad8d..4749181e 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -390,8 +390,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))
-        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);
 }
@@ -727,13 +727,17 @@ int readKeyFile(uint8_t key[8])
 {
 
 	FILE *f;
-
+	int retval = 1;
 	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 1;
+	return retval;
 
 }