FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands...

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 5138a997bfff243968e0bf30ecbd3a3726eb06d2..3fed7c95b05e546c6a16de830ebb4775ddeee685 100644 (file)
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -767,8 +767,6 @@ static void simulate_acquire_nonces()
 
 static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, bool nonce_file_write, bool slow)
 {
-       uint8_t three_in_row = 0;
-       uint8_t prev_best = 0;
        clock_t time1 = clock();
        bool initialize = true;
        bool finished = false;
@@ -779,6 +777,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
        uint32_t next_fivehundred = 500;
        uint32_t total_added_nonces = 0;
        uint32_t idx = 1;
+       uint32_t timeout  = 0;
        FILE *fnonces = NULL;
        field_off = false;
        UsbCommand resp;
@@ -791,8 +790,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
        do {
        
                flags = 0;
-               //flags |= initialize ? 0x0001 : 0;
-               flags |= 0x0001;
+               flags |= initialize ? 0x0001 : 0;
                flags |= slow ? 0x0002 : 0;
                flags |= field_off ? 0x0004 : 0;
                c.arg[2] = flags;
@@ -802,10 +800,15 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                
                if (field_off) break;
 
-               if (!WaitForResponseTimeout(CMD_ACK, &resp, 6000)) {
-                       if (fnonces) fclose(fnonces);
-                       return 1;
-               }
+               while(!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+                       timeout++;
+                       printf(".");
+                       if (timeout > 3) {
+                               PrintAndLog("\nNo response from Proxmark. Aborting...");
+                               if (fnonces) fclose(fnonces);
+                               return 1;
+                       }
+               }               
 
                if (resp.arg[0]) {
                        if (fnonces) fclose(fnonces);
@@ -871,31 +874,14 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                                        );                              
                        }
                        
-                       if ( num_good_first_bytes > 0 ) {
-                               
-                               if ( prev_best == best_first_bytes[0] ){
-                                       ++three_in_row;
-                               } else {
-                                       three_in_row = 0;
-                               }
-                               prev_best = best_first_bytes[0];
-                               
-                               //printf("GOOD BYTES: %s \n", sprint_hex(best_first_bytes, num_good_first_bytes) );
-                               if ( total_added_nonces >= (NONCES_THRESHOLD * idx) || three_in_row >= 3) {
-                                       
-                                       bool cracking = generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess);
-                                       if (cracking || known_target_key != -1) {
-                                               
-                                               UsbCommand cOff = {CMD_FPGA_MAJOR_MODE_OFF, {0,0,0} };
-                                               SendCommand(&cOff);
-                                               field_off = brute_force();
+                       if (total_added_nonces >= (NONCES_THRESHOLD * idx)) {
+                               if (num_good_first_bytes > 0) {
+                                       if (generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess) || known_target_key != -1) {
+                                               field_off = brute_force(); // switch off field with next SendCommand and then finish
                                        }
-                                       three_in_row = 0;
                                }
+                               idx++;
                        }
-                       
-                       if ( total_added_nonces >= (NONCES_THRESHOLD * idx)) 
-                                       ++idx;
                }
        } while (!finished);
 
@@ -1743,12 +1729,14 @@ static bool brute_force(void) {
        return ret;
 }
 
-int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests) 
+int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *found_key) 
 {
        // initialize Random number generator
        time_t t;
        srand((unsigned) time(&t));
        
+       *found_key = 0;
+       
        if (trgkey != NULL) {
                known_target_key = bytes_to_num(trgkey, 6);
        } else {
@@ -1800,6 +1788,10 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                } else { // acquire nonces.
                        uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow);
                        if (is_OK != 0) {
+                               free_nonces_memory();
+                               //free_statelist_cache();
+                               free_candidates_memory(candidates);
+                               candidates = NULL;
                                return is_OK;
                        }
                }
@@ -1810,5 +1802,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                free_candidates_memory(candidates);
                candidates = NULL;
        }
+       *found_key = foundkey;
        return 0;
-}
+}
\ No newline at end of file