CHG: Thanks to @Mackwa for looking up the expected Desfire EV2 major version byte.

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 427f503d234aa5cf51f15ce5c33461851cb04911..800c90f113016126d27a87493c79ea9b4ae29bc0 100644 (file)
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -605,11 +605,11 @@ static uint16_t estimate_second_byte_sum(void)
 static int read_nonce_file(void)
 {
        FILE *fnonces = NULL;
-       uint8_t trgBlockNo;
-       uint8_t trgKeyType;
+       uint8_t trgBlockNo = 0;
+       uint8_t trgKeyType = 0;
        uint8_t read_buf[9];
-       uint32_t nt_enc1, nt_enc2;
-       uint8_t par_enc;
+       uint32_t nt_enc1 = 0, nt_enc2 = 0;
+       uint8_t par_enc = 0;
        int total_num_nonces = 0;
        
        if ((fnonces = fopen("nonces.bin","rb")) == NULL) { 
@@ -640,7 +640,6 @@ static int read_nonce_file(void)
        }
        fclose(fnonces);
        PrintAndLog("Read %d nonces from file. cuid=%08x, Block=%d, Keytype=%c", total_num_nonces, cuid, trgBlockNo, trgKeyType==0?'A':'B');
-
        return 0;
 }
 
@@ -814,7 +813,6 @@ 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);
                                
-
                                if (nonce_file_write) {
                                        fwrite(bufp, 1, 9, fnonces);
                                }
@@ -1400,7 +1398,11 @@ static const uint64_t crack_states_bitsliced(statelist_t *p){
                bitslice_t * restrict lstate_p = _aligned_malloc((STATE_SIZE+ROLLBACK_SIZE) * bSize, bSize);
        #endif
 #else
+       #ifdef __APPLE__
+               bitslice_t * restrict lstate_p = malloc((STATE_SIZE+ROLLBACK_SIZE) * bSize);
+       #else
                bitslice_t * restrict lstate_p = memalign(bSize, (STATE_SIZE+ROLLBACK_SIZE) * bSize);
+       #endif
 #endif
 
                if ( !lstate_p )        {
@@ -1632,7 +1634,8 @@ static void brute_force(void)
         time_t start, end;
         time(&start);
         keys_found = 0;
-
+               foundkey = 0;
+               
         crypto1_bs_init();
 
         PrintAndLog("Using %u-bit bitslices", MAX_BITSLICES);
@@ -1744,8 +1747,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 
                //Tests();
 
-               PrintAndLog("");
-               PrintAndLog("Sum(a0) = %d", first_byte_Sum);
+               //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],