github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
CHG: better message when failed to find the key.
CHG: revert nonces check, 12 -> 100
This commit is contained in:
iceman1001 2016-04-23 19:09:07 +02:00
commit 21d359f68f
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhfmfhard.c
View file

@ -33,9 +33,6 @@
#include <malloc.h> #include <malloc.h>
#include <assert.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 CONFIDENCE_THRESHOLD 0.95 // Collect nonces until we are certain enough that the following brute force is successfull
#define GOOD_BYTES_REQUIRED 28 #define GOOD_BYTES_REQUIRED 28
@ -1679,10 +1676,11 @@ static void brute_force(void)
time(&end); time(&end);
unsigned long elapsed_time = difftime(end, start); 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){
if(!keys_found){ PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);
assert(total_states_tested == maximum_states); } else {
} PrintAndLog("Fail! Tested %"PRIu32" states, in %u seconds", total_states_tested, elapsed_time);
}
// reset this counter for the next call // reset this counter for the next call
nonces_to_bruteforce = 0; nonces_to_bruteforce = 0;
} }

2
client/nonce2key/crypto1_bs.h
View file

@ -58,7 +58,7 @@ bitslice_t bs_zeroes;
#define ROLLBACK_SIZE 8 #define ROLLBACK_SIZE 8
// number of nonces required to test to cover entire 48-bit state // 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 // 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 // state pointer management
extern __thread bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE]; extern __thread bitslice_t states[KEYSTREAM_SIZE+STATE_SIZE];