CHG: "hf mf hardnested" - less printing

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 670e5f7bac3898c142af00f96421c4573e857311..cb234e03e89733aa6decefd44c602fa71da86c7f 100644 (file)
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -13,28 +13,7 @@
 //   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 GOOD_BYTES_REQUIRED    13              // default 28, could be smaller == faster
@@ -95,13 +74,6 @@ typedef struct noncelist {
        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;
@@ -147,9 +119,8 @@ bool cracking = false;
 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);
 
@@ -647,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);
@@ -664,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;
 }
@@ -877,23 +850,19 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
 
                        if (thread_check_started) {
                                if (thread_check_done) {
-                                       //printf ("Detect check thread end ..\n");
                                        pthread_join (thread_check, 0);
-                                       idx = cargs.idx;
                                        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++;
+                                       }
+                               }
                        }
                }
 
@@ -1351,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) {
@@ -1676,28 +1645,19 @@ out:
     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();
 
-       if (cargs->total_added_nonces > MIN_NONCES_REQUIRED)
-       {
-               if (cargs->total_added_nonces > (NONCES_TRIGGER*cargs->idx) || num_good_first_bytes >= GOOD_BYTES_REQUIRED) {
-                       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++;
-               }
+       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;
-               }
+       if (cracking) {
+               field_off = brute_force(); // switch off field with next SendCommand and then finish
+               cracking = false;
        }
 
        thread_check_done = true;