Merge pull request #2 from holiman/coverity_fixes

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

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 2bedad8dcfb6a8d75e49c652bed05334445e0ad4..4749181e3dc395fcdac6fd82c01495c3333de657 100644 (file)
--- 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))
        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);
 }


@@ -727,13 +727,17 @@ int readKeyFile(uint8_t key[8])
 {
 
        FILE *f;
 {
 
        FILE *f;

-
+       int retval = 1;

        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 1;
+       return retval;

 
 }
 
 
 }