CHG: we don't want to assert inside the pm3 client.

CHG: better message when failed to find the key.
CHG: revert nonces check, 12 -> 100

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 15bdd566ff188a8366fe1b484bb795eca1fcebb6..015da045fd59ae143264f30d7abba93f08f25914 100644 (file)
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -33,9 +33,6 @@
 #include <malloc.h>
 #include <assert.h>
 
 #include <malloc.h>
 #include <assert.h>
 

-// uint32_t test_state_odd = 0;
-// uint32_t test_state_even = 0;
-

 #define CONFIDENCE_THRESHOLD   0.95            // Collect nonces until we are certain enough that the following brute force is successfull
 #define GOOD_BYTES_REQUIRED            28
 
 #define CONFIDENCE_THRESHOLD   0.95            // Collect nonces until we are certain enough that the following brute force is successfull
 #define GOOD_BYTES_REQUIRED            28
 


@@ -1679,10 +1676,11 @@ static void brute_force(void)
 
         time(&end);
         unsigned long elapsed_time = difftime(end, start);
 
         time(&end);
         unsigned long elapsed_time = difftime(end, start);

-        PrintAndLog("Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);
-        if(!keys_found){
-            assert(total_states_tested == maximum_states);
-        }
+        if(keys_found){
+                       PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);
+        } 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;
        }

diff --git a/client/nonce2key/crypto1_bs.h b/client/nonce2key/crypto1_bs.h
index bef5c5e961c15f54b3dee06f3f6458db7304945d..8f332749d572ff3033f537b5649cb0b5ed30e853 100644 (file)
--- a/client/nonce2key/crypto1_bs.h
+++ b/client/nonce2key/crypto1_bs.h
@@ -58,7 +58,7 @@ bitslice_t bs_zeroes;
 #define ROLLBACK_SIZE 8
 // number of nonces required to test to cover entire 48-bit state
 // I would have said it's 12... but bla goes with 100, so I do too
 #define ROLLBACK_SIZE 8
 // number of nonces required to test to cover entire 48-bit state
 // I would have said it's 12... but bla goes with 100, so I do too

-#define NONCE_TESTS 12
+#define NONCE_TESTS 100

 
 // state pointer management
 extern __thread bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE];
 
 // state pointer management
 extern __thread bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE];