Merge pull request #47 from osysltd/patch-4

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 956da8e8473893ed2edc06a042e233222f23b109..cb234e03e89733aa6decefd44c602fa71da86c7f 100644 (file)
--- 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
 //-----------------------------------------------------------------------------
 //   Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
 //   Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------

-
-#include <stdlib.h> 
-#include <stdio.h>
-#include <string.h>
-#include <pthread.h>
-#include <locale.h>
-#include <math.h>
-#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 <windows.h>
-#endif
-// don't include for APPLE/mac which has malloc stuff elsewhere.
-#ifndef __APPLE__
-       #include <malloc.h>
-#endif
-#include <assert.h>
+#include "cmdhfmfhard.h"

 
 #define CONFIDENCE_THRESHOLD   0.95            // Collect nonces until we are certain enough that the following brute force is successfull
 
 #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
 
 
 #define END_OF_LIST_MARKER             0xFFFFFFFF
 


@@ -93,13 +74,6 @@ typedef struct noncelist {
        float score1, score2;
 } noncelist_t;
 
        float score1, score2;
 } noncelist_t;
 

-typedef struct check_args {
-       uint32_t next_fivehundred;
-       uint32_t total_num_nonces;
-       uint32_t total_added_nonces;
-       uint32_t idx;
-} check_args_t;
-

 static size_t nonces_to_bruteforce = 0;
 static noncelistentry_t *brute_force_nonces[256];
 static uint32_t cuid = 0;
 static size_t nonces_to_bruteforce = 0;
 static noncelistentry_t *brute_force_nonces[256];
 static uint32_t cuid = 0;


@@ -145,9 +119,8 @@ bool cracking = false;
 bool field_off = false;
 
 pthread_t thread_check;
 bool field_off = false;
 
 pthread_t thread_check;

-check_args_t cargs;

 
 

-static void* check_thread(void*);
+static void* check_thread();

 static bool generate_candidates(uint16_t, uint16_t);
 static bool brute_force(void);
 
 static bool generate_candidates(uint16_t, uint16_t);
 static bool brute_force(void);
 


@@ -645,6 +618,7 @@ static int read_nonce_file(void)
        if ( bytes_read == 0) {
                PrintAndLog("File reading error.");
                fclose(fnonces);
        if ( bytes_read == 0) {
                PrintAndLog("File reading error.");
                fclose(fnonces);

+               fnonces = NULL;

                return 1;
        }
        cuid = bytes_to_num(read_buf, 4);
                return 1;
        }
        cuid = bytes_to_num(read_buf, 4);


@@ -662,6 +636,7 @@ static int read_nonce_file(void)
                total_num_nonces += 2;
        }
        fclose(fnonces);
                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;
 }
        PrintAndLog("Read %d nonces from file. cuid=%08x, Block=%d, Keytype=%c", total_num_nonces, cuid, trgBlockNo, trgKeyType==0?'A':'B');
        return 0;
 }


@@ -788,6 +763,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
        field_off = false;
        cracking = false;
 
        field_off = false;
        cracking = false;

+       thread_check_started = false;
+       thread_check_done = false;

 
        printf("Acquiring nonces...\n");
 
 
        printf("Acquiring nonces...\n");
 


@@ -844,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);
                                
                                //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);
                                }
                                
                                        fwrite(bufp, 1, 9, fnonces);
                                }
                                


@@ -873,34 +850,36 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
                        if (thread_check_started) {
                                if (thread_check_done) {
 
                        if (thread_check_started) {
                                if (thread_check_done) {

-                                       //printf ("Detect check thread end ..\n");

                                        pthread_join (thread_check, 0);
                                        pthread_join (thread_check, 0);

-                                       idx = cargs.idx;

                                        thread_check_started = thread_check_done = false;
                                }
                        } else {
                                        thread_check_started = thread_check_done = false;
                                }
                        } else {

-                               //printf ("Starting check thread ...\n");
-                               memset (&cargs, 0, sizeof (cargs));
-
-                               // set arguments
-                               cargs.next_fivehundred = next_fivehundred;
-                               cargs.total_num_nonces = total_num_nonces;
-                               cargs.total_added_nonces = total_added_nonces;
-                               cargs.idx = idx;
-
-                               pthread_create (&thread_check, NULL, check_thread, (void *)&cargs);
-                               thread_check_started = true;
+                               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)) {
                        }
                }
 
                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]) {
                                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
                        }
                }
                                return resp.arg[0];  // error during nested_hard
                        }
                }


@@ -909,8 +888,9 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
        } while (!finished);
 
 
        } while (!finished);
 

-       if (nonce_file_write) {
+       if (nonce_file_write && fnonces) {

                fclose(fnonces);
                fclose(fnonces);

+               fnonces = NULL;

        }
        
        time1 = clock() - time1;
        }
        
        time1 = clock() - time1;


@@ -927,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 };
 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++) {
        
        printf("Allocating memory for partial statelists...\n");
        for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) {


@@ -1330,7 +1311,7 @@ static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                }
        }
 
                }
        }
 

-       if (maximum_states == 0) return false;
+       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.0));
        


@@ -1339,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) {
        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) {
                                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) {


@@ -1380,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];
        }
        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) {
        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) {


@@ -1661,25 +1645,18 @@ out:
     return key;
 }
 
     return key;
 }
 

-static void* check_thread(void* x)
+static void* check_thread()

 {
 {

-       check_args_t *cargs = (check_args_t *)x;
-
-       // printf("first_byte_num = %d, first_byte_Sum = %d\n", first_byte_num, first_byte_Sum);

        num_good_first_bytes = estimate_second_byte_sum();
        num_good_first_bytes = estimate_second_byte_sum();

-       if (cargs->total_added_nonces > (2500*cargs->idx)) {
-               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();
-               cargs->idx++;
-       }

 
 

-       if (cracking || num_good_first_bytes >= GOOD_BYTES_REQUIRED) {
-               if (cargs->total_added_nonces > 2500+1000) {
-                       field_off = brute_force(); // switch off field with next SendCommand and then finish
-               }
+       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;
        }
 
                cracking = false;
        }
 


@@ -1718,7 +1695,7 @@ static bool brute_force(void)
                PrintAndLog("Looking for known target key in remaining key space...");
                ret = TestIfKeyExists(known_target_key);
        } else {
                PrintAndLog("Looking for known target key in remaining key space...");
                ret = TestIfKeyExists(known_target_key);
        } else {

-               if (maximum_states == 0) return false;
+               if (maximum_states == 0) return false; // prevent keyspace reduction error (2^-inf)

 
                PrintAndLog("Brute force phase starting.");
                time_t start, end;
 
                PrintAndLog("Brute force phase starting.");
                time_t start, end;


@@ -1825,6 +1802,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                        candidates = NULL;
                }
                fclose(fstats);
                        candidates = NULL;
                }
                fclose(fstats);

+               fstats = NULL;

        } else {
                init_nonce_memory();
                if (nonce_file_read) {          // use pre-acquired data from file nonces.bin
        } else {
                init_nonce_memory();
                if (nonce_file_read) {          // use pre-acquired data from file nonces.bin