X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/236e8f7cc6c74b43bed738741c28b03cf11888ea..360caababff8eaed758d3d32864435185fd36eed:/client/cmdhfmfhard.c?ds=sidebyside diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c index ea46469f..dcf454c5 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,9 +18,8 @@ #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 CRACKING_THRESHOLD 39.00f // as 2^39 +#define NONCES_THRESHOLD 5000 // every N nonces check if we can crack the key +#define CRACKING_THRESHOLD 38.00f // as 2^38 #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); @@ -289,13 +284,14 @@ 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); } - static inline uint_fast8_t common_bits(uint_fast8_t bytes_diff) { static const uint_fast8_t common_bits_LUT[256] = { @@ -497,7 +493,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; @@ -560,9 +556,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; + } } @@ -618,7 +616,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); @@ -636,7 +633,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; } @@ -726,7 +722,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); @@ -760,38 +756,34 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ uint32_t idx = 1; FILE *fnonces = NULL; UsbCommand resp; - field_off = false; - thread_check_started = false; - thread_check_done = false; - + UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 0}}; + memcpy(c.d.asBytes, key, 6); + 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; flags |= field_off ? 0x0004 : 0; - UsbCommand c = {CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, flags}}; - memcpy(c.d.asBytes, key, 6); - + c.arg[2] = flags; + clearCommandBuffer(); SendCommand(&c); - if (field_off) finished = true; - - if (initialize) { - if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) return 1; - if (resp.arg[0]) return resp.arg[0]; // error during nested_hard + if (field_off) break; + if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) { + if (fnonces) fclose(fnonces); + return 1; + } + if (resp.arg[0]) { + if (fnonces) fclose(fnonces); + return resp.arg[0]; // error during nested_hard + } + + if (initialize) { + // global var CUID cuid = resp.arg[1]; - // PrintAndLog("Acquiring nonces for CUID 0x%08x", cuid); if (nonce_file_write && fnonces == NULL) { if ((fnonces = fopen("nonces.bin","wb")) == NULL) { PrintAndLog("Could not create file nonces.bin"); @@ -802,95 +794,65 @@ 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); } + initialize = false; } - - if (!initialize) { - uint32_t nt_enc1, nt_enc2; - uint8_t par_enc; - uint16_t num_acquired_nonces = resp.arg[2]; - uint8_t *bufp = resp.d.asBytes; - for (uint16_t i = 0; i < num_acquired_nonces; i+=2) { - nt_enc1 = bytes_to_num(bufp, 4); - nt_enc2 = bytes_to_num(bufp+4, 4); - par_enc = bytes_to_num(bufp+8, 1); - - //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4); - total_added_nonces += add_nonce(nt_enc1, par_enc >> 4); - //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 && fnonces) { - fwrite(bufp, 1, 9, fnonces); - } - - bufp += 9; + + uint32_t nt_enc1, nt_enc2; + uint8_t par_enc; + uint16_t num_acquired_nonces = resp.arg[2]; + uint8_t *bufp = resp.d.asBytes; + for (uint16_t i = 0; i < num_acquired_nonces; i+=2) { + nt_enc1 = bytes_to_num(bufp, 4); + nt_enc2 = bytes_to_num(bufp+4, 4); + par_enc = bytes_to_num(bufp+8, 1); + + //printf("Encrypted nonce: %08x, encrypted_parity: %02x\n", nt_enc1, par_enc >> 4); + total_added_nonces += add_nonce(nt_enc1, par_enc >> 4); + //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 && fnonces) { + fwrite(bufp, 1, 9, fnonces); + fflush(fnonces); } - - total_num_nonces += num_acquired_nonces; + bufp += 9; } - - if (first_byte_num == 256 && !field_off) { - // printf("first_byte_num = %d, first_byte_Sum = %d\n", first_byte_num, first_byte_Sum); + total_num_nonces += num_acquired_nonces; + + if (first_byte_num == 256) { + 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; - 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,1). #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 > 0 ) { + bool cracking = generate_candidates(first_byte_Sum, nonces[best_first_bytes[0]].Sum8_guess); + 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; - } - return 1; - } - - if (resp.arg[0]) { - if (fnonces) { // fix segfault on proxmark3 v1 when reset button is pressed - fclose(fnonces); - fnonces = NULL; - } - return resp.arg[0]; // error during nested_hard - } - } - - initialize = false; - } while (!finished); - if (nonce_file_write && fnonces) { + if (nonce_file_write && fnonces) fclose(fnonces); - fnonces = NULL; - } time1 = clock() - time1; if ( time1 > 0 ) { @@ -1250,7 +1212,7 @@ static bool TestIfKeyExists(uint64_t key) uint32_t state_odd = pcs->odd & 0x00ffffff; uint32_t state_even = pcs->even & 0x00ffffff; //printf("Tests: searching for key %llx after first byte 0x%02x (state_odd = 0x%06x, state_even = 0x%06x) ...\n", key, best_first_bytes[0], state_odd, state_even); - + printf("Validating keysearch space\n"); uint64_t count = 0; for (statelist_t *p = candidates; p != NULL; p = p->next) { bool found_odd = false; @@ -1272,7 +1234,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("Key Found after testing %llu (2^%1.1f) out of %lld (2^%1.1f) keys.", count, log(count)/log(2), maximum_states, @@ -1312,7 +1274,7 @@ 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)); + printf("Number of possible keys with Sum(a0) = %d: %"PRIu64" (2^%1.1f)\n", sum_a0, maximum_states, log(maximum_states)/log(2)); init_statelist_cache(); @@ -1325,13 +1287,14 @@ 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]) < MIN(partial_statelist[q].len[EVEN_STATE], partial_statelist[s].len[EVEN_STATE])) { - add_matching_states(current_candidates, p, r, ODD_STATE); + add_matching_states(current_candidates, p, r, ODD_STATE); if(current_candidates->len[ODD_STATE]) { - add_matching_states(current_candidates, q, s, EVEN_STATE); + add_matching_states(current_candidates, q, s, EVEN_STATE); } else { current_candidates->len[EVEN_STATE] = 0; uint32_t *p = current_candidates->states[EVEN_STATE] = malloc(sizeof(uint32_t)); @@ -1355,15 +1318,17 @@ 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]; } if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf) - float kcalc = log(maximum_states)/log(2.0); + float kcalc = log(maximum_states)/log(2); printf("Number of remaining possible keys: %"PRIu64" (2^%1.1f)\n", maximum_states, kcalc); if (write_stats) { if (maximum_states != 0) { @@ -1398,10 +1363,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; @@ -1644,24 +1610,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; @@ -1685,25 +1633,24 @@ static void* crack_states_thread(void* x){ return NULL; } -static bool brute_force(void) -{ +static bool brute_force(void) { + if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf) + bool ret = false; if (known_target_key != -1) { 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); + + clock_t time1 = clock(); keys_found = 0; foundkey = 0; crypto1_bs_init(); PrintAndLog("Using %u-bit bitslices", MAX_BITSLICES); - PrintAndLog("Bitslicing best_first_byte^uid[3] (rollback byte): %02x...", best_first_bytes[0]^(cuid>>24)); + PrintAndLog("Bitslicing best_first_byte^uid[3] (rollback byte): %02X ...", best_first_bytes[0]^(cuid>>24)); // convert to 32 bit little-endian crypto1_bs_bitslice_value32((best_first_bytes[0]<<24)^cuid, bitsliced_rollback_byte, 8); @@ -1720,10 +1667,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); @@ -1743,21 +1691,16 @@ static bool brute_force(void) pthread_join(threads[i], 0); } - time(&end); - double elapsed_time = difftime(end, start); - + time1 = clock() - time1; + PrintAndLog("\nTime for bruteforce %0.1f seconds.",((float)time1)/CLOCKS_PER_SEC); + 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); ret = true; - } else { - PrintAndLog("Fail! Tested %"PRIu32" states, in %.f seconds", total_states_tested, elapsed_time); - } - + } // reset this counter for the next call nonces_to_bruteforce = 0; } - return ret; } @@ -1816,8 +1759,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) { @@ -1826,21 +1771,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc } //Tests(); - - //PrintAndLog(""); - //PrintAndLog("Sum(a0) = %d", first_byte_Sum); - // PrintAndLog("Best 10 first bytes: %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x", - // best_first_bytes[0], - // best_first_bytes[1], - // best_first_bytes[2], - // best_first_bytes[3], - // best_first_bytes[4], - // best_first_bytes[5], - // best_first_bytes[6], - // best_first_bytes[7], - // best_first_bytes[8], - // best_first_bytes[9] ); - free_nonces_memory(); free_statelist_cache(); free_candidates_memory(candidates); @@ -1848,5 +1778,3 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc } return 0; } - -