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

CHG: Cleaning up

Browse source
This commit is contained in:
iceman1001 2016-11-18 11:31:52 +01:00
commit 711ae19fca
1 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/cmdhfmfhard.c
View file

@ -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) 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(); clock_t time1 = clock();
bool initialize = true; bool initialize = true;
bool finished = false; bool finished = false;
@ -791,8 +789,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
do { do {
flags = 0; flags = 0;
//flags |= initialize ? 0x0001 : 0; flags |= initialize ? 0x0001 : 0;
flags |= 0x0001;
flags |= slow ? 0x0002 : 0; flags |= slow ? 0x0002 : 0;
flags |= field_off ? 0x0004 : 0; flags |= field_off ? 0x0004 : 0;
c.arg[2] = flags; c.arg[2] = flags;
@ -871,31 +868,14 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
); );
} }
if (total_added_nonces >= (NONCES_THRESHOLD * idx)) {
if (num_good_first_bytes > 0) { if (num_good_first_bytes > 0) {
if (generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess) || known_target_key != -1) {
if ( prev_best == best_first_bytes[0] ){ field_off = brute_force(); // switch off field with next SendCommand and then finish
++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();
}
three_in_row = 0;
} }
} }
idx++;
if ( total_added_nonces >= (NONCES_THRESHOLD * idx)) }
++idx;
} }
} while (!finished); } while (!finished);