RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-20 03:48:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

shadowing

Browse source
This commit is contained in:
iceman1001 2019-04-07 20:12:24 +02:00
parent b37981df74
commit f27d618a08
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
client/cmdhfmfhard.c
View file

@ -1284,7 +1284,6 @@ static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t
} }
static void simulate_acquire_nonces() { static void simulate_acquire_nonces() {
time_t time1 = time(NULL); time_t time1 = time(NULL);
last_sample_clock = 0; last_sample_clock = 0;
@ -1292,7 +1291,7 @@ static void simulate_acquire_nonces() {
hardnested_stage = CHECK_1ST_BYTES; hardnested_stage = CHECK_1ST_BYTES;
bool acquisition_completed = false; bool acquisition_completed = false;
uint32_t total_num_nonces = 0; uint32_t total_num_nonces = 0;
float brute_force; float brute_force_depth;
bool reported_suma8 = false; bool reported_suma8 = false;
cuid = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff); cuid = (rand() & 0xff) << 24 | (rand() & 0xff) << 16 | (rand() & 0xff) << 8 | (rand() & 0xff);
@ -1331,19 +1330,19 @@ static void simulate_acquire_nonces() {
apply_sum_a0(); apply_sum_a0();
} }
update_nonce_data(true); update_nonce_data(true);
acquisition_completed = shrink_key_space(&brute_force); acquisition_completed = shrink_key_space(&brute_force_depth);
if (!reported_suma8) { if (!reported_suma8) {
char progress_string[80]; char progress_string[80];
sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]); sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0); hardnested_print_progress(num_acquired_nonces, progress_string, brute_force_depth, 0);
reported_suma8 = true; reported_suma8 = true;
} else { } else {
hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0); hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
} }
} else { } else {
update_nonce_data(true); update_nonce_data(true);
acquisition_completed = shrink_key_space(&brute_force); acquisition_completed = shrink_key_space(&brute_force_depth);
hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0); hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
} }
} while (!acquisition_completed); } while (!acquisition_completed);
@ -1369,7 +1368,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
uint32_t flags = 0; uint32_t flags = 0;
uint8_t write_buf[9]; uint8_t write_buf[9];
uint32_t total_num_nonces = 0; uint32_t total_num_nonces = 0;
float brute_force; float brute_force_depth;
bool reported_suma8 = false; bool reported_suma8 = false;
char progress_text[80]; char progress_text[80];
FILE *fnonces = NULL; FILE *fnonces = NULL;
@ -1453,19 +1452,19 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
apply_sum_a0(); apply_sum_a0();
} }
update_nonce_data(true); update_nonce_data(true);
acquisition_completed = shrink_key_space(&brute_force); acquisition_completed = shrink_key_space(&brute_force_depth);
if (!reported_suma8) { if (!reported_suma8) {
char progress_string[80]; char progress_string[80];
sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]); sprintf(progress_string, "Apply Sum property. Sum(a0) = %d", sums[first_byte_Sum]);
hardnested_print_progress(num_acquired_nonces, progress_string, brute_force, 0); hardnested_print_progress(num_acquired_nonces, progress_string, brute_force_depth, 0);
reported_suma8 = true; reported_suma8 = true;
} else { } else {
hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0); hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
} }
} else { } else {
update_nonce_data(true); update_nonce_data(true);
acquisition_completed = shrink_key_space(&brute_force); acquisition_completed = shrink_key_space(&brute_force_depth);
hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force, 0); hardnested_print_progress(num_acquired_nonces, "Apply bit flip properties", brute_force_depth, 0);
} }
} }
@ -2293,8 +2292,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
} }
hardnested_stage = CHECK_1ST_BYTES | CHECK_2ND_BYTES; hardnested_stage = CHECK_1ST_BYTES | CHECK_2ND_BYTES;
update_nonce_data(false); update_nonce_data(false);
float brute_force; float brute_force_depth;
shrink_key_space(&brute_force); shrink_key_space(&brute_force_depth);
} else { // acquire nonces. } else { // acquire nonces.
uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow, filename); uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow, filename);
if (is_OK != 0) { if (is_OK != 0) {