X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/057d2e9147bc7d8fb3f7c4d7928e66e23fd58e50..2b2bccbdd26a6bc0325daeb3b0c064317538cc17:/client/cmdhfmfhard.c diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c index e9a2e696..cb234e03 100644 --- a/client/cmdhfmfhard.c +++ b/client/cmdhfmfhard.c @@ -13,31 +13,12 @@ // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on // Computer and Communications Security, 2015 //----------------------------------------------------------------------------- - -#include -#include -#include -#include -#include -#include -#include "proxmark3.h" -#include "cmdmain.h" -#include "ui.h" -#include "util.h" -#include "nonce2key/crapto1.h" -#include "nonce2key/crypto1_bs.h" -#include "parity.h" -#ifdef __WIN32 - #include -#endif -// don't include for APPLE/mac which has malloc stuff elsewhere. -#ifndef __APPLE__ - #include -#endif -#include +#include "cmdhfmfhard.h" #define CONFIDENCE_THRESHOLD 0.95 // Collect nonces until we are certain enough that the following brute force is successfull -#define GOOD_BYTES_REQUIRED 13 // default 28, could be smaller == faster +#define GOOD_BYTES_REQUIRED 13 // default 28, could be smaller == faster +#define MIN_NONCES_REQUIRED 4000 // 4000-5000 could be good +#define NONCES_TRIGGER 2500 // every 2500 nonces check if we can crack the key #define END_OF_LIST_MARKER 0xFFFFFFFF @@ -132,6 +113,14 @@ static partial_indexed_statelist_t partial_statelist[17]; static partial_indexed_statelist_t statelist_bitflip; static statelist_t *candidates = NULL; +bool thread_check_started = false; +bool thread_check_done = false; +bool cracking = false; +bool field_off = false; + +pthread_t thread_check; + +static void* check_thread(); static bool generate_candidates(uint16_t, uint16_t); static bool brute_force(void); @@ -629,6 +618,7 @@ static int read_nonce_file(void) if ( bytes_read == 0) { PrintAndLog("File reading error."); fclose(fnonces); + fnonces = NULL; return 1; } cuid = bytes_to_num(read_buf, 4); @@ -646,6 +636,7 @@ static int read_nonce_file(void) total_num_nonces += 2; } fclose(fnonces); + fnonces = NULL; PrintAndLog("Read %d nonces from file. cuid=%08x, Block=%d, Keytype=%c", total_num_nonces, cuid, trgBlockNo, trgKeyType==0?'A':'B'); return 0; } @@ -759,7 +750,6 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ { clock_t time1 = clock(); bool initialize = true; - bool field_off = false; bool finished = false; bool filter_flip_checked = false; uint32_t flags = 0; @@ -771,11 +761,21 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ FILE *fnonces = NULL; UsbCommand resp; + field_off = false; + cracking = false; + thread_check_started = false; + thread_check_done = false; + printf("Acquiring nonces...\n"); - + clearCommandBuffer(); do { + if (cracking) { + sleep(3); + continue; + } + flags = 0; flags |= initialize ? 0x0001 : 0; flags |= slow ? 0x0002 : 0; @@ -821,7 +821,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc2, par_enc & 0x0f); total_added_nonces += add_nonce(nt_enc2, par_enc & 0x0f); - if (nonce_file_write) { + if (nonce_file_write && fnonces) { fwrite(bufp, 1, 9, fnonces); } @@ -831,12 +831,13 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ total_num_nonces += num_acquired_nonces; } - if (first_byte_num == 256 ) { + if (first_byte_num == 256 && !field_off) { // printf("first_byte_num = %d, first_byte_Sum = %d\n", first_byte_num, first_byte_Sum); if (!filter_flip_checked) { Check_for_FilterFlipProperties(); filter_flip_checked = true; } + num_good_first_bytes = estimate_second_byte_sum(); if (total_num_nonces > next_fivehundred) { next_fivehundred = (total_num_nonces/500+1) * 500; @@ -845,32 +846,40 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ total_added_nonces, CONFIDENCE_THRESHOLD * 100.0, num_good_first_bytes); - - if (total_added_nonces > (2500*idx)) { - clock_t time1 = clock(); - field_off = generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess); - time1 = clock() - time1; - if ( time1 > 0 ) PrintAndLog("Time for generating key candidates list: %1.0f seconds", ((float)time1)/CLOCKS_PER_SEC); - if (known_target_key != -1) brute_force(); - idx++; - } - } - if (num_good_first_bytes >= GOOD_BYTES_REQUIRED) { - field_off = true; // switch off field with next SendCommand and then finish } - if (field_off) { - field_off = finished = brute_force(); + if (thread_check_started) { + if (thread_check_done) { + pthread_join (thread_check, 0); + thread_check_started = thread_check_done = false; + } + } else { + if (total_added_nonces >= MIN_NONCES_REQUIRED) + { + num_good_first_bytes = estimate_second_byte_sum(); + if (total_added_nonces > (NONCES_TRIGGER*idx) || num_good_first_bytes >= GOOD_BYTES_REQUIRED) { + pthread_create (&thread_check, NULL, check_thread, NULL); + thread_check_started = true; + idx++; + } + } } } if (!initialize) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) { - fclose(fnonces); + if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed + fclose(fnonces); + fnonces = NULL; + } return 1; } + if (resp.arg[0]) { - fclose(fnonces); + if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed + fclose(fnonces); + fnonces = NULL; + } return resp.arg[0]; // error during nested_hard } } @@ -879,9 +888,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ } while (!finished); - - if (nonce_file_write) { + if (nonce_file_write && fnonces) { fclose(fnonces); + fnonces = NULL; } time1 = clock() - time1; @@ -898,7 +907,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ static int init_partial_statelists(void) { const uint32_t sizes_odd[17] = { 126757, 0, 18387, 0, 74241, 0, 181737, 0, 248801, 0, 182033, 0, 73421, 0, 17607, 0, 125601 }; - const uint32_t sizes_even[17] = { 125723, 0, 17867, 0, 74305, 0, 178707, 0, 248801, 0, 185063, 0, 73356, 0, 18127, 0, 126634 }; +// const uint32_t sizes_even[17] = { 125723, 0, 17867, 0, 74305, 0, 178707, 0, 248801, 0, 185063, 0, 73356, 0, 18127, 0, 126634 }; + const uint32_t sizes_even[17] = { 125723, 0, 17867, 0, 74305, 0, 178707, 0, 248801, 0, 185063, 0, 73357, 0, 18127, 0, 126635 }; printf("Allocating memory for partial statelists...\n"); for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) { @@ -1301,6 +1311,8 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8) } } + if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf) + printf("Number of possible keys with Sum(a0) = %d: %"PRIu64" (2^%1.1f)\n", sum_a0, maximum_states, log(maximum_states)/log(2.0)); init_statelist_cache(); @@ -1308,8 +1320,8 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8) for (uint16_t p = 0; p <= 16; p += 2) { for (uint16_t q = 0; q <= 16; q += 2) { if (p*(16-q) + (16-p)*q == sum_a0) { - printf("Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n", - p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]); + // printf("Reducing Partial Statelists (p,q) = (%d,%d) with lengths %d, %d\n", + // p, q, partial_statelist[p].len[ODD_STATE], partial_statelist[q].len[EVEN_STATE]); for (uint16_t r = 0; r <= 16; r += 2) { for (uint16_t s = 0; s <= 16; s += 2) { if (r*(16-s) + (16-r)*s == sum_a8) { @@ -1349,6 +1361,9 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8) for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) { maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE]; } + + if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf) + float kcalc = log(maximum_states)/log(2.0); printf("Number of remaining possible keys: %"PRIu64" (2^%1.1f)\n", maximum_states, kcalc); if (write_stats) { @@ -1497,7 +1512,7 @@ static const uint64_t crack_states_bitsliced(statelist_t *p){ const bitslice_value_t odd_feedback = odd_feedback_bit ? bs_ones.value : bs_zeroes.value; for(size_t block_idx = 0; block_idx < bitsliced_blocks; ++block_idx){ - bitslice_t const * restrict bitsliced_even_state = bitsliced_even_states[block_idx]; + const bitslice_t * const restrict bitsliced_even_state = bitsliced_even_states[block_idx]; size_t state_idx; // set even bits for(state_idx = 0; state_idx < STATE_SIZE-ROLLBACK_SIZE; state_idx+=2){ @@ -1630,6 +1645,26 @@ out: return key; } +static void* check_thread() +{ + num_good_first_bytes = estimate_second_byte_sum(); + + clock_t time1 = clock(); + cracking = generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess); + time1 = clock() - time1; + if ( time1 > 0 ) PrintAndLog("Time for generating key candidates list: %1.0f seconds", ((float)time1)/CLOCKS_PER_SEC); + if (known_target_key != -1) brute_force(); + + if (cracking) { + field_off = brute_force(); // switch off field with next SendCommand and then finish + cracking = false; + } + + thread_check_done = true; + + return (void *) NULL; +} + static void* crack_states_thread(void* x){ const size_t thread_id = (size_t)x; size_t current_bucket = thread_id; @@ -1660,6 +1695,8 @@ static bool brute_force(void) PrintAndLog("Looking for known target key in remaining key space..."); ret = TestIfKeyExists(known_target_key); } else { + if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf) + PrintAndLog("Brute force phase starting."); time_t start, end; time(&start); @@ -1712,15 +1749,9 @@ static bool brute_force(void) time(&end); double elapsed_time = difftime(end, start); - if(keys_found){ + if (keys_found && TestIfKeyExists(foundkey)) { PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %.f seconds", total_states_tested, keys_found, elapsed_time); PrintAndLog("\nFound key: %012"PRIx64"\n", foundkey); - known_target_key = foundkey; - - ret = TestIfKeyExists(known_target_key); - - PrintAndLog("Check if key is found in the keyspace: %d", ret); - ret = true; } else { PrintAndLog("Fail! Tested %"PRIu32" states, in %.f seconds", total_states_tested, elapsed_time); @@ -1771,6 +1802,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc candidates = NULL; } fclose(fstats); + fstats = NULL; } else { init_nonce_memory(); if (nonce_file_read) { // use pre-acquired data from file nonces.bin