ADD: added some identification on between old Desfire, Desfire EV1 and Desfire EV2

[proxmark3-svn] / client / cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index f4d4648656a30924380bd7b32c2b792075139a2b..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;
 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];
        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) { 
        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');
        }
        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;
 }
 
        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);
                                
                                //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);
                                }
                                if (nonce_file_write) {
                                        fwrite(bufp, 1, 9, fnonces);
                                }


@@ -1357,6 +1355,7 @@ static void free_statelist_cache(void)
        }               
 }
 
        }               
 }
 

+uint64_t foundkey = 0;

 size_t keys_found = 0;
 size_t bucket_count = 0;
 statelist_t* buckets[128];
 size_t keys_found = 0;
 size_t bucket_count = 0;
 statelist_t* buckets[128];


@@ -1399,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
                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);
                bitslice_t * restrict lstate_p = memalign(bSize, (STATE_SIZE+ROLLBACK_SIZE) * bSize);

+       #endif

 #endif
 
                if ( !lstate_p )        {
 #endif
 
                if ( !lstate_p )        {


@@ -1606,8 +1609,8 @@ static void* crack_states_thread(void* x){
                if(bucket){
             const uint64_t key = crack_states_bitsliced(bucket);
             if(key != -1){
                if(bucket){
             const uint64_t key = crack_states_bitsliced(bucket);
             if(key != -1){

-                printf("\nFound key: %012"PRIx64"\n", key);

                 __sync_fetch_and_add(&keys_found, 1);
                 __sync_fetch_and_add(&keys_found, 1);

+                               __sync_fetch_and_add(&foundkey, key);

                 break;
             } else if(keys_found){
                 break;
                 break;
             } else if(keys_found){
                 break;


@@ -1631,13 +1634,13 @@ static void brute_force(void)
         time_t start, end;
         time(&start);
         keys_found = 0;
         time_t start, end;
         time(&start);
         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));
         // convert to 32 bit little-endian
         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));
         // convert to 32 bit little-endian

-        //crypto1_bs_bitslice_value32(rev32((best_first_bytes[0]^(cuid>>24))), bitsliced_rollback_byte, 8);

                crypto1_bs_bitslice_value32((best_first_bytes[0]<<24)^cuid, bitsliced_rollback_byte, 8);
                        
         PrintAndLog("Bitslicing nonces...");
                crypto1_bs_bitslice_value32((best_first_bytes[0]<<24)^cuid, bitsliced_rollback_byte, 8);
                        
         PrintAndLog("Bitslicing nonces...");


@@ -1663,6 +1666,7 @@ static void brute_force(void)
                if ( thread_count < 1)
                        thread_count = 1;
 #endif  /* _WIN32 */
                if ( thread_count < 1)
                        thread_count = 1;
 #endif  /* _WIN32 */

+

         pthread_t threads[thread_count];
                
         // enumerate states using all hardware threads, each thread handles one bucket
         pthread_t threads[thread_count];
                
         // enumerate states using all hardware threads, each thread handles one bucket


@@ -1679,6 +1683,7 @@ static void brute_force(void)
         unsigned long elapsed_time = difftime(end, start);
         if(keys_found){
                        PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);
         unsigned long elapsed_time = difftime(end, start);
         if(keys_found){
                        PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);

+                       PrintAndLog("\nFound key: %012"PRIx64"\n", foundkey);

         } else {
                        PrintAndLog("Fail! Tested %"PRIu32" states, in %u seconds", total_states_tested, elapsed_time);
                }
         } else {
                        PrintAndLog("Fail! Tested %"PRIu32" states, in %u seconds", total_states_tested, elapsed_time);
                }


@@ -1740,10 +1745,10 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                        }
                }
 
                        }
                }
 

-               Tests();
+               //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],
                // PrintAndLog("Best 10 first bytes: %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x",
                        // best_first_bytes[0],
                        // best_first_bytes[1],