chg: removed a useless clearing of key_count. From @matrix https://github.com/matrix...

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index fb576441bc5271b8ffa093915a684fcab7ac7e37..1f739dc46c3babf9af6d603659b017360745efcc 100644 (file)
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1,6 +1,7 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2015 piwi
 // fiddled with 2016 Azcid (hardnested bitsliced Bruteforce imp)
 //-----------------------------------------------------------------------------
 // Copyright (C) 2015 piwi
 // fiddled with 2016 Azcid (hardnested bitsliced Bruteforce imp)

+// fiddled with 2016 Matrix ( sub testing of nonces while collecting )

 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.


@@ -17,9 +18,8 @@
 
 #define CONFIDENCE_THRESHOLD   0.95            // Collect nonces until we are certain enough that the following brute force is successfull
 #define GOOD_BYTES_REQUIRED    13              // default 28, could be smaller == faster
 
 #define CONFIDENCE_THRESHOLD   0.95            // Collect nonces until we are certain enough that the following brute force is successfull
 #define GOOD_BYTES_REQUIRED    13              // default 28, could be smaller == faster

-#define MIN_NONCES_REQUIRED    4000            // 4000-5000 could be good
-#define NONCES_TRIGGER         2500            // every 2500 nonces check if we can crack the key
-#define CRACKING_THRESHOLD     39.00f          // as 2^39
+#define NONCES_THRESHOLD       5000            // every N nonces check if we can crack the key
+#define CRACKING_THRESHOLD     38.00f          // as 2^38

 
 #define END_OF_LIST_MARKER             0xFFFFFFFF
 
 
 #define END_OF_LIST_MARKER             0xFFFFFFFF
 


@@ -114,13 +114,8 @@ static partial_indexed_statelist_t partial_statelist[17];
 static partial_indexed_statelist_t statelist_bitflip;
 static statelist_t *candidates = NULL;
 
 static partial_indexed_statelist_t statelist_bitflip;
 static statelist_t *candidates = NULL;
 

-bool thread_check_started = false;
-bool thread_check_done = false;

 bool field_off = false;
 
 bool field_off = false;
 

-pthread_t thread_check;
-
-static void* check_thread();

 static bool generate_candidates(uint16_t, uint16_t);
 static bool brute_force(void);
 
 static bool generate_candidates(uint16_t, uint16_t);
 static bool brute_force(void);
 


@@ -261,10 +256,7 @@ static double p_hypergeometric(uint16_t N, uint16_t K, uint16_t n, uint16_t k)
                for (int16_t i = N; i >= N-n+1; i--) {
                        log_result -= log(i);
                }
                for (int16_t i = N; i >= N-n+1; i--) {
                        log_result -= log(i);
                }

-               if ( log_result > 0 )
-                       return exp(log_result);
-               else 
-                       return 0.0;
+               return exp(log_result);

        } else {
                if (n-k == N-K) {       // special case. The published recursion below would fail with a divide by zero exception
                        double log_result = 0.0;
        } else {
                if (n-k == N-K) {       // special case. The published recursion below would fail with a divide by zero exception
                        double log_result = 0.0;


@@ -288,6 +280,8 @@ static float sum_probability(uint16_t K, uint16_t n, uint16_t k)
        if (k > K || p_K[K] == 0.0) return 0.0;
 
        double p_T_is_k_when_S_is_K = p_hypergeometric(N, K, n, k);
        if (k > K || p_K[K] == 0.0) return 0.0;
 
        double p_T_is_k_when_S_is_K = p_hypergeometric(N, K, n, k);

+       if (p_T_is_k_when_S_is_K == 0.0) return 0.0;
+

        double p_S_is_K = p_K[K];
        double p_T_is_k = 0;
        for (uint16_t i = 0; i <= 256; i++) {
        double p_S_is_K = p_K[K];
        double p_T_is_k = 0;
        for (uint16_t i = 0; i <= 256; i++) {


@@ -295,10 +289,10 @@ static float sum_probability(uint16_t K, uint16_t n, uint16_t k)
                        p_T_is_k += p_K[i] * p_hypergeometric(N, i, n, k);
                }
        }
                        p_T_is_k += p_K[i] * p_hypergeometric(N, i, n, k);
                }
        }

+       if (p_T_is_k == 0.0) return 0.0;

        return(p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k);
 }
 
        return(p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k);
 }
 

-       

 static inline uint_fast8_t common_bits(uint_fast8_t bytes_diff) 
 {
        static const uint_fast8_t common_bits_LUT[256] = {
 static inline uint_fast8_t common_bits(uint_fast8_t bytes_diff) 
 {
        static const uint_fast8_t common_bits_LUT[256] = {


@@ -500,7 +494,7 @@ static void sort_best_first_bytes(void)
                        }
                }
                        best_first_bytes[j] = i;
                        }
                }
                        best_first_bytes[j] = i;

-               }
+       }

 
        // determine how many are above the CONFIDENCE_THRESHOLD
        uint16_t num_good_nonces = 0;
 
        // determine how many are above the CONFIDENCE_THRESHOLD
        uint16_t num_good_nonces = 0;


@@ -563,9 +557,11 @@ static void sort_best_first_bytes(void)
        }       
 
        // swap best possible first byte to the pole position
        }       
 
        // swap best possible first byte to the pole position

+       if (best_first_byte != 0) {

        uint16_t temp = best_first_bytes[0];
        best_first_bytes[0] = best_first_bytes[best_first_byte];
        best_first_bytes[best_first_byte] = temp;
        uint16_t temp = best_first_bytes[0];
        best_first_bytes[0] = best_first_bytes[best_first_byte];
        best_first_bytes[best_first_byte] = temp;

+       }

        
 }
 
        
 }
 


@@ -621,7 +617,6 @@ static int read_nonce_file(void)
        if ( bytes_read == 0) {
                PrintAndLog("File reading error.");
                fclose(fnonces);
        if ( bytes_read == 0) {
                PrintAndLog("File reading error.");
                fclose(fnonces);

-               fnonces = NULL;

                return 1;
        }
        cuid = bytes_to_num(read_buf, 4);
                return 1;
        }
        cuid = bytes_to_num(read_buf, 4);


@@ -639,7 +634,6 @@ static int read_nonce_file(void)
                total_num_nonces += 2;
        }
        fclose(fnonces);
                total_num_nonces += 2;
        }
        fclose(fnonces);

-       fnonces = NULL;

        PrintAndLog("Read %d nonces from file. cuid=%08x, Block=%d, Keytype=%c", total_num_nonces, cuid, trgBlockNo, trgKeyType==0?'A':'B');
        return 0;
 }
        PrintAndLog("Read %d nonces from file. cuid=%08x, Block=%d, Keytype=%c", total_num_nonces, cuid, trgBlockNo, trgKeyType==0?'A':'B');
        return 0;
 }


@@ -729,7 +723,7 @@ static void simulate_acquire_nonces()
                        if (total_num_nonces > next_fivehundred) {
                                next_fivehundred = (total_num_nonces/500+1) * 500;
                                printf("Acquired %5d nonces (%5d with distinct bytes 0 and 1). Number of bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n",
                        if (total_num_nonces > next_fivehundred) {
                                next_fivehundred = (total_num_nonces/500+1) * 500;
                                printf("Acquired %5d nonces (%5d with distinct bytes 0 and 1). Number of bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n",

-                                       total_num_nonces, 
+                                       total_num_nonces,

                                        total_added_nonces,
                                        CONFIDENCE_THRESHOLD * 100.0,
                                        num_good_first_bytes);
                                        total_added_nonces,
                                        CONFIDENCE_THRESHOLD * 100.0,
                                        num_good_first_bytes);


@@ -763,38 +757,34 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
        uint32_t idx = 1;
        FILE *fnonces = NULL;
        UsbCommand resp;
        uint32_t idx = 1;
        FILE *fnonces = NULL;
        UsbCommand resp;

-

        field_off = false;
        field_off = false;

-       thread_check_started = false;
-       thread_check_done = false;
-
+       UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 0}};
+       memcpy(c.d.asBytes, key, 6);
+       

        printf("Acquiring nonces...\n");
        printf("Acquiring nonces...\n");

-
-       clearCommandBuffer();
-

        do {
        do {

-               if (thread_check_started && !thread_check_done) {
-                       sleep(3);
-                       continue;
-               }
-

                flags = 0;
                flags |= initialize ? 0x0001 : 0;
                flags |= slow ? 0x0002 : 0;
                flags |= field_off ? 0x0004 : 0;
                flags = 0;
                flags |= initialize ? 0x0001 : 0;
                flags |= slow ? 0x0002 : 0;
                flags |= field_off ? 0x0004 : 0;

-               UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}};
-               memcpy(c.d.asBytes, key, 6);
-
+               c.arg[2] = flags;
+               clearCommandBuffer();

                SendCommand(&c);
                
                SendCommand(&c);
                

-               if (field_off) finished = true;
-               
-               if (initialize) {
-                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) return 1;
-                       if (resp.arg[0]) return resp.arg[0];  // error during nested_hard
+               if (field_off) break;

 
 

+               if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
+                       if (fnonces) fclose(fnonces);
+                       return 1;
+               }
+               if (resp.arg[0]) {
+                       if (fnonces) fclose(fnonces);
+                       return resp.arg[0];  // error during nested_hard
+               }
+                       
+               if (initialize) {
+                       // global var CUID

                        cuid = resp.arg[1];
                        cuid = resp.arg[1];

-                       // PrintAndLog("Acquiring nonces for CUID 0x%08x", cuid); 

                        if (nonce_file_write && fnonces == NULL) {
                                if ((fnonces = fopen("nonces.bin","wb")) == NULL) { 
                                        PrintAndLog("Could not create file nonces.bin");
                        if (nonce_file_write && fnonces == NULL) {
                                if ((fnonces = fopen("nonces.bin","wb")) == NULL) { 
                                        PrintAndLog("Could not create file nonces.bin");


@@ -805,95 +795,65 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                                fwrite(write_buf, 1, 4, fnonces);
                                fwrite(&trgBlockNo, 1, 1, fnonces);
                                fwrite(&trgKeyType, 1, 1, fnonces);
                                fwrite(write_buf, 1, 4, fnonces);
                                fwrite(&trgBlockNo, 1, 1, fnonces);
                                fwrite(&trgKeyType, 1, 1, fnonces);

+                               fflush(fnonces);

                        }
                        }

+                       initialize = false;                     

                }
                }

-
-               if (!initialize) {
-                       uint32_t nt_enc1, nt_enc2;
-                       uint8_t par_enc;
-                       uint16_t num_acquired_nonces = resp.arg[2];
-                       uint8_t *bufp = resp.d.asBytes;
-                       for (uint16_t i = 0; i < num_acquired_nonces; i+=2) {
-                               nt_enc1 = bytes_to_num(bufp, 4);
-                               nt_enc2 = bytes_to_num(bufp+4, 4);
-                               par_enc = bytes_to_num(bufp+8, 1);
-                               
-                               //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
-                               total_added_nonces += add_nonce(nt_enc1, par_enc >> 4);
-                               //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc2, par_enc & 0x0f);
-                               total_added_nonces += add_nonce(nt_enc2, par_enc & 0x0f);
-                               
-                               if (nonce_file_write && fnonces) {
-                                       fwrite(bufp, 1, 9, fnonces);
-                               }
-                               
-                               bufp += 9;
+               
+               uint32_t nt_enc1, nt_enc2;
+               uint8_t par_enc;
+               uint16_t num_acquired_nonces = resp.arg[2];
+               uint8_t *bufp = resp.d.asBytes;
+               for (uint16_t i = 0; i < num_acquired_nonces; i+=2) {
+                       nt_enc1 = bytes_to_num(bufp, 4);
+                       nt_enc2 = bytes_to_num(bufp+4, 4);
+                       par_enc = bytes_to_num(bufp+8, 1);
+                       
+                       //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4);
+                       total_added_nonces += add_nonce(nt_enc1, par_enc >> 4);
+                       //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc2, par_enc & 0x0f);
+                       total_added_nonces += add_nonce(nt_enc2, par_enc & 0x0f);
+                       
+                       if (nonce_file_write && fnonces) {
+                               fwrite(bufp, 1, 9, fnonces);
+                               fflush(fnonces);

                        }
                        }

-
-                       total_num_nonces += num_acquired_nonces;
+                       bufp += 9;

                }
                }

-               
-               if (first_byte_num == 256 && !field_off) {
-                       // printf("first_byte_num = %d, first_byte_Sum = %d\n", first_byte_num, first_byte_Sum);
+               total_num_nonces += num_acquired_nonces;
+
+               if (first_byte_num == 256) {
+

                        if (!filter_flip_checked) {
                                Check_for_FilterFlipProperties();
                                filter_flip_checked = true;
                        }
 
                        num_good_first_bytes = estimate_second_byte_sum();
                        if (!filter_flip_checked) {
                                Check_for_FilterFlipProperties();
                                filter_flip_checked = true;
                        }
 
                        num_good_first_bytes = estimate_second_byte_sum();

+

                        if (total_num_nonces > next_fivehundred) {
                                next_fivehundred = (total_num_nonces/500+1) * 500;
                        if (total_num_nonces > next_fivehundred) {
                                next_fivehundred = (total_num_nonces/500+1) * 500;

-                               printf("Acquired %5d nonces (%5d with distinct bytes 0 and 1). Number of bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n",
-                                       total_num_nonces, 
+                               printf("Acquired %5d nonces (%5d/%5d with distinct bytes 0,1). #bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n",
+                                       total_num_nonces,

                                        total_added_nonces,
                                        total_added_nonces,

+                                       NONCES_THRESHOLD * idx,

                                        CONFIDENCE_THRESHOLD * 100.0,
                                        num_good_first_bytes);
                        }
 
                                        CONFIDENCE_THRESHOLD * 100.0,
                                        num_good_first_bytes);
                        }
 

-                       if (thread_check_started) {
-                               if (thread_check_done) {
-                                       pthread_join (thread_check, 0);
-                                       thread_check_started = thread_check_done = false;
-                               }
-                       } else {
-                               if (total_added_nonces >= MIN_NONCES_REQUIRED)
-                               {
-                                       num_good_first_bytes = estimate_second_byte_sum();
-                                       if (total_added_nonces > (NONCES_TRIGGER*idx) || num_good_first_bytes >= GOOD_BYTES_REQUIRED) {
-                                               pthread_create (&thread_check, NULL, check_thread, NULL);
-                                               thread_check_started = true;
-                                               idx++;
-                                       }
-                               }
-                       }
-               }
-
-               if (!initialize) {
-                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-                               if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed
-                                       fclose(fnonces);
-                                       fnonces = NULL;
-                               }
-                               return 1;
-                       }
-
-                       if (resp.arg[0]) {
-                               if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed
-                                       fclose(fnonces);
-                                       fnonces = NULL;
+                       if (total_added_nonces >= (NONCES_THRESHOLD * idx) && num_good_first_bytes > 0 ) {
+                               bool cracking = generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess);
+                               if (cracking || known_target_key != -1) {
+                                       field_off = brute_force(); // switch off field with next SendCommand and then finish

                                }
                                }

-                               return resp.arg[0];  // error during nested_hard
+                               idx++;

                        }
                }
 
                        }
                }
 

-               initialize = false;
-

        } while (!finished);
 
        } while (!finished);
 

-       if (nonce_file_write && fnonces) {
+       if (nonce_file_write && fnonces)

                fclose(fnonces);
                fclose(fnonces);

-               fnonces = NULL;
-       }

        
        time1 = clock() - time1;
        if ( time1 > 0 ) {
        
        time1 = clock() - time1;
        if ( time1 > 0 ) {


@@ -1198,7 +1158,7 @@ static int add_matching_states(statelist_t *candidates, uint16_t part_sum_a0, ui
        for (uint32_t *p1 = partial_statelist[part_sum_a0].states[odd_even]; *p1 != END_OF_LIST_MARKER; p1++) {
                uint32_t search_mask = 0x000ffff0;
                uint32_t *p2 = find_first_state((*p1 << 4), search_mask, &partial_statelist[part_sum_a8], odd_even);
        for (uint32_t *p1 = partial_statelist[part_sum_a0].states[odd_even]; *p1 != END_OF_LIST_MARKER; p1++) {
                uint32_t search_mask = 0x000ffff0;
                uint32_t *p2 = find_first_state((*p1 << 4), search_mask, &partial_statelist[part_sum_a8], odd_even);

-               if (p2 != NULL) {
+               if (p1 != NULL && p2 != NULL) {

                        while (((*p1 << 4) & search_mask) == (*p2 & search_mask) && *p2 != END_OF_LIST_MARKER) {
                                if ((nonces[best_first_bytes[0]].BitFlip[odd_even] && find_first_state((*p1 << 4) | *p2, 0x000fffff, &statelist_bitflip, 0))
                                        || !nonces[best_first_bytes[0]].BitFlip[odd_even]) {
                        while (((*p1 << 4) & search_mask) == (*p2 & search_mask) && *p2 != END_OF_LIST_MARKER) {
                                if ((nonces[best_first_bytes[0]].BitFlip[odd_even] && find_first_state((*p1 << 4) | *p2, 0x000fffff, &statelist_bitflip, 0))
                                        || !nonces[best_first_bytes[0]].BitFlip[odd_even]) {


@@ -1236,6 +1196,8 @@ static statelist_t *add_more_candidates(statelist_t *current_candidates)
        } else {
                new_candidates = current_candidates->next = (statelist_t *)malloc(sizeof(statelist_t));
        }
        } else {
                new_candidates = current_candidates->next = (statelist_t *)malloc(sizeof(statelist_t));
        }

+       if (!new_candidates) return NULL;
+

        new_candidates->next = NULL;
        new_candidates->len[ODD_STATE] = 0;
        new_candidates->len[EVEN_STATE] = 0;
        new_candidates->next = NULL;
        new_candidates->len[ODD_STATE] = 0;
        new_candidates->len[EVEN_STATE] = 0;


@@ -1253,7 +1215,7 @@ static bool TestIfKeyExists(uint64_t key)
        uint32_t state_odd = pcs->odd & 0x00ffffff;
        uint32_t state_even = pcs->even & 0x00ffffff;
        //printf("Tests: searching for key %llx after first byte 0x%02x (state_odd = 0x%06x, state_even = 0x%06x) ...\n", key, best_first_bytes[0], state_odd, state_even);
        uint32_t state_odd = pcs->odd & 0x00ffffff;
        uint32_t state_even = pcs->even & 0x00ffffff;
        //printf("Tests: searching for key %llx after first byte 0x%02x (state_odd = 0x%06x, state_even = 0x%06x) ...\n", key, best_first_bytes[0], state_odd, state_even);

-       
+       printf("Validating keysearch space\n");

        uint64_t count = 0;
        for (statelist_t *p = candidates; p != NULL; p = p->next) {
                bool found_odd = false;
        uint64_t count = 0;
        for (statelist_t *p = candidates; p != NULL; p = p->next) {
                bool found_odd = false;


@@ -1275,7 +1237,7 @@ static bool TestIfKeyExists(uint64_t key)
                }
                count += (p_odd - p->states[ODD_STATE]) * (p_even - p->states[EVEN_STATE]);
                if (found_odd && found_even) {
                }
                count += (p_odd - p->states[ODD_STATE]) * (p_even - p->states[EVEN_STATE]);
                if (found_odd && found_even) {

-                       PrintAndLog("Key Found after testing %lld (2^%1.1f) out of %lld (2^%1.1f) keys. ", 
+                       PrintAndLog("Key Found after testing %llu (2^%1.1f) out of %lld (2^%1.1f) keys.", 

                                count,
                                log(count)/log(2), 
                                maximum_states,
                                count,
                                log(count)/log(2), 
                                maximum_states,


@@ -1328,6 +1290,7 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                                        for (uint16_t s = 0; s <= 16; s += 2) {
                                                if (r*(16-s) + (16-r)*s == sum_a8) {
                                                        current_candidates = add_more_candidates(current_candidates);
                                        for (uint16_t s = 0; s <= 16; s += 2) {
                                                if (r*(16-s) + (16-r)*s == sum_a8) {
                                                        current_candidates = add_more_candidates(current_candidates);

+                                                       if (current_candidates != NULL) {

                                                        // check for the smallest partial statelist. Try this first - it might give 0 candidates 
                                                        // and eliminate the need to calculate the other part
                                                        if (MIN(partial_statelist[p].len[ODD_STATE], partial_statelist[r].len[ODD_STATE]) 
                                                        // check for the smallest partial statelist. Try this first - it might give 0 candidates 
                                                        // and eliminate the need to calculate the other part
                                                        if (MIN(partial_statelist[p].len[ODD_STATE], partial_statelist[r].len[ODD_STATE]) 


@@ -1358,9 +1321,11 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                        }
                }
        }                                       
                        }
                }
        }                                       

+       }                                       

 
        maximum_states = 0;
 
        maximum_states = 0;

-       for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
+       unsigned int n = 0;
+       for (statelist_t *sl = candidates; sl != NULL && n < 128; sl = sl->next, n++) {

                maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
        }
 
                maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
        }
 


@@ -1401,10 +1366,11 @@ static void free_statelist_cache(void)
        }               
 }
 
        }               
 }
 

+#define MAX_BUCKETS 128

 uint64_t foundkey = 0;
 size_t keys_found = 0;
 size_t bucket_count = 0;
 uint64_t foundkey = 0;
 size_t keys_found = 0;
 size_t bucket_count = 0;

-statelist_t* buckets[128];
+statelist_t* buckets[MAX_BUCKETS];

 size_t total_states_tested = 0;
 size_t thread_count = 4;
 
 size_t total_states_tested = 0;
 size_t thread_count = 4;
 


@@ -1647,24 +1613,6 @@ out:
     return key;
 }
 
     return key;
 }
 

-static void* check_thread()
-{
-       num_good_first_bytes = estimate_second_byte_sum();
-
-       clock_t time1 = clock();
-       bool cracking = generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess);
-       time1 = clock() - time1;
-       if (time1 > 0) PrintAndLog("Time for generating key candidates list: %1.0f seconds", ((float)time1)/CLOCKS_PER_SEC);
-
-       if (cracking || known_target_key != -1) {
-               field_off = brute_force(); // switch off field with next SendCommand and then finish
-       }
-
-       thread_check_done = true;
-
-       return (void *) NULL;
-}
-

 static void* crack_states_thread(void* x){
     const size_t thread_id = (size_t)x;
     size_t current_bucket = thread_id;
 static void* crack_states_thread(void* x){
     const size_t thread_id = (size_t)x;
     size_t current_bucket = thread_id;


@@ -1688,18 +1636,17 @@ static void* crack_states_thread(void* x){
     return NULL;
 }
 
     return NULL;
 }
 

-static bool brute_force(void)
-{
+static bool brute_force(void) {
+       if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf)
+               

        bool ret = false;
        if (known_target_key != -1) {
                PrintAndLog("Looking for known target key in remaining key space...");
                ret = TestIfKeyExists(known_target_key);
        } else {
        bool ret = false;
        if (known_target_key != -1) {
                PrintAndLog("Looking for known target key in remaining key space...");
                ret = TestIfKeyExists(known_target_key);
        } else {

-               if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf)
-

                PrintAndLog("Brute force phase starting.");
                PrintAndLog("Brute force phase starting.");

-               time_t start, end;
-               time(&start);
+
+               clock_t time1 = clock();                

                keys_found = 0;
                foundkey = 0;
 
                keys_found = 0;
                foundkey = 0;
 


@@ -1723,10 +1670,11 @@ static bool brute_force(void)
 
                // count number of states to go
                bucket_count = 0;
 
                // count number of states to go
                bucket_count = 0;

-               for (statelist_t *p = candidates; p != NULL; p = p->next) {
+               for (statelist_t *p = candidates; p != NULL && bucket_count < MAX_BUCKETS; p = p->next) {

                        buckets[bucket_count] = p;
                        bucket_count++;
                }
                        buckets[bucket_count] = p;
                        bucket_count++;
                }

+               buckets[bucket_count] = NULL;

 
 #ifndef __WIN32
                thread_count = sysconf(_SC_NPROCESSORS_CONF);
 
 #ifndef __WIN32
                thread_count = sysconf(_SC_NPROCESSORS_CONF);


@@ -1746,21 +1694,16 @@ static bool brute_force(void)
                        pthread_join(threads[i], 0);
                }
 
                        pthread_join(threads[i], 0);
                }
 

-               time(&end);
-               unsigned long  elapsed_time = difftime(end, start);
-
+               time1 = clock() - time1;
+               PrintAndLog("\nTime for bruteforce %0.1f seconds.",((float)time1)/CLOCKS_PER_SEC);              
+               

                if (keys_found && TestIfKeyExists(foundkey)) {
                if (keys_found && TestIfKeyExists(foundkey)) {

-                       PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);

                        PrintAndLog("\nFound key: %012"PRIx64"\n", foundkey);
                        ret = true;
                        PrintAndLog("\nFound key: %012"PRIx64"\n", foundkey);
                        ret = true;

-               } else {
-                       PrintAndLog("Fail! Tested %"PRIu32" states, in %u seconds", total_states_tested, elapsed_time);
-               }
-
+               } 

                // reset this counter for the next call
                nonces_to_bruteforce = 0;
        }
                // reset this counter for the next call
                nonces_to_bruteforce = 0;
        }

-

        return ret;
 }
 
        return ret;
 }
 


@@ -1819,8 +1762,10 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                        if (time1 > 0)
                                PrintAndLog("Time for generating key candidates list: %1.0f seconds", ((float)time1)/CLOCKS_PER_SEC);
 
                        if (time1 > 0)
                                PrintAndLog("Time for generating key candidates list: %1.0f seconds", ((float)time1)/CLOCKS_PER_SEC);
 

-                       if (cracking)
+                       if (cracking || known_target_key != -1) {

                                brute_force();
                                brute_force();

+                       }
+

                } else { // acquire nonces.
                        uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow);
                        if (is_OK != 0) {
                } else { // acquire nonces.
                        uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow);
                        if (is_OK != 0) {


@@ -1829,21 +1774,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                }
 
                //Tests();
                }
 
                //Tests();

-
-               //PrintAndLog("");
-               //PrintAndLog("Sum(a0) = %d", first_byte_Sum);
-               // PrintAndLog("Best 10 first bytes: %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x",
-                       // best_first_bytes[0],
-                       // best_first_bytes[1],
-                       // best_first_bytes[2],
-                       // best_first_bytes[3],
-                       // best_first_bytes[4],
-                       // best_first_bytes[5],
-                       // best_first_bytes[6],
-                       // best_first_bytes[7],
-                       // best_first_bytes[8],
-                       // best_first_bytes[9]  );
-

                free_nonces_memory();
                free_statelist_cache();
                free_candidates_memory(candidates);
                free_nonces_memory();
                free_statelist_cache();
                free_candidates_memory(candidates);


@@ -1851,5 +1781,3 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
        }
        return 0;
 }
        }
        return 0;
 }

-
-