X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3c528f5fda84614c430d195624b3e8e18f954a5a..236e8f7cc6c74b43bed738741c28b03cf11888ea:/client/cmdhfmfhard.c diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c index 0687e2bb..ea46469f 100644 --- a/client/cmdhfmfhard.c +++ b/client/cmdhfmfhard.c @@ -13,33 +13,13 @@ // 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 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 END_OF_LIST_MARKER 0xFFFFFFFF @@ -136,7 +116,6 @@ 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; @@ -639,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); @@ -656,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; } @@ -781,7 +762,6 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ UsbCommand resp; field_off = false; - cracking = false; thread_check_started = false; thread_check_done = false; @@ -790,7 +770,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_ clearCommandBuffer(); do { - if (cracking) { + if (thread_check_started && !thread_check_done) { sleep(3); continue; } @@ -1339,8 +1319,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) { @@ -1392,7 +1372,7 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8) fprintf(fstats, "%1.1f;", 0.0); } } - if (kcalc < 39.00f) return true; + if (kcalc < CRACKING_THRESHOLD) return true; return false; } @@ -1669,14 +1649,12 @@ 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); + 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 (known_target_key != -1) brute_force(); + 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) { field_off = brute_force(); // switch off field with next SendCommand and then finish - cracking = false; } thread_check_done = true; @@ -1824,13 +1802,23 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc fstats = NULL; } else { init_nonce_memory(); - if (nonce_file_read) { // use pre-acquired data from file nonces.bin + if (nonce_file_read) { // use pre-acquired data from file nonces.bin if (read_nonce_file() != 0) { return 3; } Check_for_FilterFlipProperties(); num_good_first_bytes = MIN(estimate_second_byte_sum(), GOOD_BYTES_REQUIRED); - } else { // acquire nonces. + PrintAndLog("Number of first bytes with confidence > %2.1f%%: %d", CONFIDENCE_THRESHOLD*100.0, num_good_first_bytes); + + 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) + brute_force(); + } else { // acquire nonces. uint16_t is_OK = acquire_nonces(blockNo, keyType, key, trgBlockNo, trgKeyType, nonce_file_write, slow); if (is_OK != 0) { return is_OK; @@ -1853,16 +1841,6 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc // best_first_bytes[8], // best_first_bytes[9] ); - //PrintAndLog("Number of first bytes with confidence > %2.1f%%: %d", CONFIDENCE_THRESHOLD*100.0, num_good_first_bytes); - - //clock_t time1 = clock(); - //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); - - //brute_force(); - free_nonces_memory(); free_statelist_cache(); free_candidates_memory(candidates);