Merge branch 'master' into fix_iclass_sim

diff --cc client/loclass/elite_crack.c
index 21a67f54c85ab26b8a604e9b89629f9385b65522,cfadcfbc3c9f66ea89377a0915fa0daf9899421f..8fda0fbd96db7d5c17ef982508f169aa2ad9d07a
--- 1/client/loclass/elite_crack.c
--- 2/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@@ -391,10 -392,10 +392,10 @@@ int bruteforceItem(dumpdata item, uint1
                //Diversify
                diversifyKey(item.csn, key_sel_p, div_key);
                //Calc mac
 -              doMAC(item.cc_nr, div_key,calculated_MAC);
 +              doMAC(item.cc_nr, div_key, calculated_MAC);
  
                if (memcmp(calculated_MAC, item.mac, 4) == 0) {
-                       for (int i =0 ; i < numbytes_to_recover; i++)
+                       for (int i = 0; i < numbytes_to_recover; i++)
                                prnlog("=> %d: 0x%02x", bytes_to_recover[i], 0xFF & keytable[bytes_to_recover[i]]);
                        found = true;
                        break;
@@@ -411,15 -413,16 +412,15 @@@
                errors++;
                //Before we exit, reset the 'BEING_CRACKED' to zero
                for (int i = 0; i < numbytes_to_recover; i++) {
-                       keytable[bytes_to_recover[i]]  &= 0xFF;
-                       keytable[bytes_to_recover[i]]  |= CRACK_FAILED;
+                       keytable[bytes_to_recover[i]] &= ~BEING_CRACKED;
                }
        } else {
-               for (int i = 0 ;i < numbytes_to_recover; i++) {
-                       keytable[bytes_to_recover[i]]  &= 0xFF;
-                       keytable[bytes_to_recover[i]]  |= CRACKED;
+               for (int i = 0; i < numbytes_to_recover; i++) {
+                       keytable[bytes_to_recover[i]] &= ~BEING_CRACKED;
+                       keytable[bytes_to_recover[i]] |= CRACKED;
                }
 -
        }
+ 
        return errors;
  }