X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9c6000a0650e066a6d46e231e7fec98d99660990..87a513aa1d0f6eccd85b46d06cd13499d048f8c9:/client/cmdhfmfhard.c diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c index fb576441..a6b9ebf1 100644 --- a/client/cmdhfmfhard.c +++ b/client/cmdhfmfhard.c @@ -1,6 +1,7 @@ //----------------------------------------------------------------------------- // Copyright (C) 2015 piwi // fiddled with 2016 Azcid (hardnested bitsliced Bruteforce imp) +// fiddled with 2016 Matrix ( sub testing of nonces while collecting ) // This code is licensed to you under the terms of the GNU GPL, version 2 or, // at your option, any later version. See the LICENSE.txt file for the text of // the license. @@ -17,8 +18,7 @@ #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 MIN_NONCES_REQUIRED 4000 // 4000-5000 could be good -#define NONCES_TRIGGER 2500 // every 2500 nonces check if we can crack the key +#define NONCES_THRESHOLD 5000 // every N nonces check if we can crack the key #define CRACKING_THRESHOLD 39.00f // as 2^39 #define END_OF_LIST_MARKER 0xFFFFFFFF @@ -114,13 +114,8 @@ 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 field_off = false; -pthread_t thread_check; - -static void* check_thread(); static bool generate_candidates(uint16_t, uint16_t); static bool brute_force(void); @@ -261,10 +256,7 @@ static double p_hypergeometric(uint16_t N, uint16_t K, uint16_t n, uint16_t k) for (int16_t i = N; i >= N-n+1; i--) { log_result -= log(i); } - if ( log_result > 0 ) - return exp(log_result); - else - return 0.0; + return exp(log_result); } else { if (n-k == N-K) { // special case. The published recursion below would fail with a divide by zero exception double log_result = 0.0; @@ -292,7 +284,9 @@ static float sum_probability(uint16_t K, uint16_t n, uint16_t k) double p_T_is_k = 0; for (uint16_t i = 0; i <= 256; i++) { if (p_K[i] != 0.0) { - p_T_is_k += p_K[i] * p_hypergeometric(N, i, n, k); + double tmp = p_hypergeometric(N, i, n, k); + if (tmp != 0.0) + p_T_is_k += p_K[i] * tmp; } } return(p_T_is_k_when_S_is_K * p_S_is_K / p_T_is_k); @@ -500,7 +494,7 @@ static void sort_best_first_bytes(void) } } best_first_bytes[j] = i; - } + } // determine how many are above the CONFIDENCE_THRESHOLD uint16_t num_good_nonces = 0; @@ -563,9 +557,11 @@ static void sort_best_first_bytes(void) } // swap best possible first byte to the pole position + if (best_first_byte != 0) { uint16_t temp = best_first_bytes[0]; best_first_bytes[0] = best_first_bytes[best_first_byte]; best_first_bytes[best_first_byte] = temp; + } } @@ -621,7 +617,6 @@ 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); @@ -639,7 +634,6 @@ 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; } @@ -729,7 +723,7 @@ static void simulate_acquire_nonces() if (total_num_nonces > next_fivehundred) { next_fivehundred = (total_num_nonces/500+1) * 500; printf("Acquired %5d nonces (%5d with distinct bytes 0 and 1). Number of bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n", - total_num_nonces, + total_num_nonces, total_added_nonces, CONFIDENCE_THRESHOLD * 100.0, num_good_first_bytes); @@ -765,19 +759,10 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ UsbCommand resp; field_off = false; - thread_check_started = false; - thread_check_done = false; printf("Acquiring nonces...\n"); - clearCommandBuffer(); - do { - if (thread_check_started && !thread_check_done) { - sleep(3); - continue; - } - flags = 0; flags |= initialize ? 0x0001 : 0; flags |= slow ? 0x0002 : 0; @@ -785,9 +770,10 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}}; memcpy(c.d.asBytes, key, 6); + clearCommandBuffer(); SendCommand(&c); - if (field_off) finished = true; + if (field_off) break; if (initialize) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) return 1; @@ -805,6 +791,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ fwrite(write_buf, 1, 4, fnonces); fwrite(&trgBlockNo, 1, 1, fnonces); fwrite(&trgKeyType, 1, 1, fnonces); + fflush(fnonces); } } @@ -825,14 +812,15 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ if (nonce_file_write && fnonces) { fwrite(bufp, 1, 9, fnonces); + fflush(fnonces); } - + bufp += 9; } total_num_nonces += num_acquired_nonces; } - + 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) { @@ -843,45 +831,38 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ num_good_first_bytes = estimate_second_byte_sum(); if (total_num_nonces > next_fivehundred) { next_fivehundred = (total_num_nonces/500+1) * 500; - printf("Acquired %5d nonces (%5d with distinct bytes 0 and 1). Number of bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n", - total_num_nonces, + printf("Acquired %5d nonces (%5d / %5d with distinct bytes 0 and 1). Number of bytes with probability for correctly guessed Sum(a8) > %1.1f%%: %d\n", + total_num_nonces, total_added_nonces, + NONCES_THRESHOLD * idx, CONFIDENCE_THRESHOLD * 100.0, num_good_first_bytes); } - 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 (total_added_nonces >= (NONCES_THRESHOLD * idx)) + { + num_good_first_bytes = estimate_second_byte_sum(); + clock_t time1 = clock(); + bool 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 (cracking || known_target_key != -1) { + field_off = brute_force(); // switch off field with next SendCommand and then finish + } + + idx++; } } - } if (!initialize) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) { - if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed - fclose(fnonces); - fnonces = NULL; - } + if (fnonces) fclose(fnonces); return 1; } if (resp.arg[0]) { - if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed - fclose(fnonces); - fnonces = NULL; - } + if (fnonces) fclose(fnonces); return resp.arg[0]; // error during nested_hard } } @@ -890,10 +871,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ } while (!finished); - if (nonce_file_write && fnonces) { + if (nonce_file_write && fnonces) fclose(fnonces); - fnonces = NULL; - } time1 = clock() - time1; if ( time1 > 0 ) { @@ -1275,7 +1254,7 @@ static bool TestIfKeyExists(uint64_t key) } count += (p_odd - p->states[ODD_STATE]) * (p_even - p->states[EVEN_STATE]); if (found_odd && found_even) { - PrintAndLog("Key Found after testing %lld (2^%1.1f) out of %lld (2^%1.1f) keys. ", + PrintAndLog("\nKey Found after testing %lld (2^%1.1f) out of %lld (2^%1.1f) keys. ", count, log(count)/log(2), maximum_states, @@ -1328,6 +1307,7 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8) for (uint16_t s = 0; s <= 16; s += 2) { if (r*(16-s) + (16-r)*s == sum_a8) { current_candidates = add_more_candidates(current_candidates); + if (current_candidates) { // check for the smallest partial statelist. Try this first - it might give 0 candidates // and eliminate the need to calculate the other part if (MIN(partial_statelist[p].len[ODD_STATE], partial_statelist[r].len[ODD_STATE]) @@ -1358,9 +1338,11 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8) } } } + } maximum_states = 0; - for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) { + unsigned int n = 0; + for (statelist_t *sl = candidates; sl != NULL && n < 128; sl = sl->next, n++) { maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE]; } @@ -1401,10 +1383,11 @@ static void free_statelist_cache(void) } } +#define MAX_BUCKETS 128 uint64_t foundkey = 0; size_t keys_found = 0; size_t bucket_count = 0; -statelist_t* buckets[128]; +statelist_t* buckets[MAX_BUCKETS]; size_t total_states_tested = 0; size_t thread_count = 4; @@ -1647,24 +1630,6 @@ out: return key; } -static void* check_thread() -{ - num_good_first_bytes = estimate_second_byte_sum(); - - clock_t time1 = clock(); - bool 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 (cracking || known_target_key != -1) { - field_off = brute_force(); // switch off field with next SendCommand and then finish - } - - 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; @@ -1698,8 +1663,8 @@ static bool brute_force(void) if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf) PrintAndLog("Brute force phase starting."); - time_t start, end; - time(&start); + + clock_t time1 = clock(); keys_found = 0; foundkey = 0; @@ -1723,10 +1688,11 @@ static bool brute_force(void) // count number of states to go bucket_count = 0; - for (statelist_t *p = candidates; p != NULL; p = p->next) { + for (statelist_t *p = candidates; p != NULL && bucket_count < MAX_BUCKETS; p = p->next) { buckets[bucket_count] = p; bucket_count++; } + buckets[bucket_count] = NULL; #ifndef __WIN32 thread_count = sysconf(_SC_NPROCESSORS_CONF); @@ -1746,15 +1712,15 @@ static bool brute_force(void) pthread_join(threads[i], 0); } - time(&end); - unsigned long elapsed_time = difftime(end, start); - + time1 = clock() - time1; + if ( time1 < 0 ) time1 = -1; + if (keys_found && TestIfKeyExists(foundkey)) { - PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time); + PrintAndLog("Success! Found %u keys after %0.0f seconds", keys_found, ((float)time1)/CLOCKS_PER_SEC); PrintAndLog("\nFound key: %012"PRIx64"\n", foundkey); ret = true; } else { - PrintAndLog("Fail! Tested %"PRIu32" states, in %u seconds", total_states_tested, elapsed_time); + PrintAndLog("Fail! Tested %"PRIu32" states, in %0.0f seconds", total_states_tested, ((float)time1)/CLOCKS_PER_SEC); } // reset this counter for the next call @@ -1819,8 +1785,10 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc if (time1 > 0) PrintAndLog("Time for generating key candidates list: %1.0f seconds", ((float)time1)/CLOCKS_PER_SEC); - if (cracking) + if (cracking || known_target_key != -1) { brute_force(); + } + } else { // acquire nonces. uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow); if (is_OK != 0) { @@ -1851,5 +1819,3 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc } return 0; } - -