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

FIX: "hf mf hardnested" - removed the call to free_candidates_memory, on my ubuntu env it crashes all the time with it.

Browse source
This commit is contained in:
iceman1001 2016-11-16 19:19:06 +01:00
commit f07ffa7672
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhfmfhard.c
View file

@ -866,12 +866,6 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
} }
num_good_first_bytes = estimate_second_byte_sum(); num_good_first_bytes = estimate_second_byte_sum();
if ( prev_best == best_first_bytes[0] ){
++three_in_row;
} else {
three_in_row = 0;
}
prev_best = best_first_bytes[0];
if (total_num_nonces > next_fivehundred) { if (total_num_nonces > next_fivehundred) {
next_fivehundred = (total_num_nonces/500+1) * 500; next_fivehundred = (total_num_nonces/500+1) * 500;
@ -885,6 +879,14 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
} }
if ( num_good_first_bytes > 0 ) { 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) ); //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) { if ( total_added_nonces >= (NONCES_THRESHOLD * idx) || three_in_row >= 3) {
@ -895,7 +897,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
SendCommand(&cOff); SendCommand(&cOff);
field_off = brute_force(); field_off = brute_force();
} }
free_candidates_memory(candidates); three_in_row = 0;
} }
} }