]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmfhard.c
Speedup Mifare Plus Attack v1
[proxmark3-svn] / client / cmdhfmfhard.c
index 800c90f113016126d27a87493c79ea9b4ae29bc0..e9a2e696db22ba3c82afdd00e95cd2e93afc6911 100644 (file)
 #ifdef __WIN32
        #include <windows.h>
 #endif
-#include <malloc.h>
+// don't include for APPLE/mac which has malloc stuff elsewhere.
+#ifndef __APPLE__
+       #include <malloc.h>
+#endif
 #include <assert.h>
 
 #define CONFIDENCE_THRESHOLD   0.95            // Collect nonces until we are certain enough that the following brute force is successfull
-#define GOOD_BYTES_REQUIRED            28
+#define GOOD_BYTES_REQUIRED            13          // default 28, could be smaller == faster
+
+#define END_OF_LIST_MARKER             0xFFFFFFFF
 
 static const float p_K[257] = {                // the probability that a random nonce has a Sum Property == K 
        0.0290, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 
@@ -127,6 +132,9 @@ static partial_indexed_statelist_t partial_statelist[17];
 static partial_indexed_statelist_t statelist_bitflip;
 static statelist_t *candidates = NULL;
 
+static bool generate_candidates(uint16_t, uint16_t);
+static bool brute_force(void);
+
 static int add_nonce(uint32_t nonce_enc, uint8_t par_enc) 
 {
        uint8_t first_byte = nonce_enc >> 24;
@@ -196,7 +204,6 @@ static void init_nonce_memory(void)
        num_good_first_bytes = 0;
 }
 
-
 static void free_nonce_list(noncelistentry_t *p)
 {
        if (p == NULL) {
@@ -760,6 +767,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
        uint32_t total_num_nonces = 0;
        uint32_t next_fivehundred = 500;
        uint32_t total_added_nonces = 0;
+       uint32_t idx = 1;
        FILE *fnonces = NULL;
        UsbCommand resp;
 
@@ -837,10 +845,23 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
                                        total_added_nonces,
                                        CONFIDENCE_THRESHOLD * 100.0,
                                        num_good_first_bytes);
+
+                               if (total_added_nonces > (2500*idx)) {
+                                       clock_t time1 = clock();
+                                       field_off = 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();
+                                       idx++;
+                               }
                        }
                        if (num_good_first_bytes >= GOOD_BYTES_REQUIRED) {
                                field_off = true;       // switch off field with next SendCommand and then finish
                        }
+
+                       if (field_off) {
+                               field_off = finished = brute_force();
+                       }
                }
 
                if (!initialize) {
@@ -865,10 +886,10 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
        
        time1 = clock() - time1;
        if ( time1 > 0 ) {
-       PrintAndLog("Acquired a total of %d nonces in %1.1f seconds (%0.0f nonces/minute)", 
-               total_num_nonces, 
-               ((float)time1)/CLOCKS_PER_SEC, 
-               total_num_nonces * 60.0 * CLOCKS_PER_SEC/(float)time1
+               PrintAndLog("Acquired a total of %d nonces in %1.1f seconds (%0.0f nonces/minute)", 
+                       total_num_nonces, 
+                       ((float)time1)/CLOCKS_PER_SEC, 
+                       total_num_nonces * 60.0 * CLOCKS_PER_SEC/(float)time1
                );
        }
        return 0;
@@ -917,7 +938,7 @@ static int init_partial_statelists(void)
                for (uint16_t i = 0; i <= 16; i += 2) {
                        uint32_t *p = partial_statelist[i].states[odd_even];
                        p += partial_statelist[i].len[odd_even];
-                       *p = 0xffffffff;
+                       *p = END_OF_LIST_MARKER;
                }
        }
        
@@ -943,7 +964,7 @@ static void init_BitFlip_statelist(void)
        }
        // set len and add End Of List marker
        statelist_bitflip.len[0] = p - statelist_bitflip.states[0];
-       *p = 0xffffffff;
+       *p = END_OF_LIST_MARKER;
        statelist_bitflip.states[0] = realloc(statelist_bitflip.states[0], sizeof(uint32_t) * (statelist_bitflip.len[0] + 1));
 }
                
@@ -953,7 +974,7 @@ static inline uint32_t *find_first_state(uint32_t state, uint32_t mask, partial_
 
        if (p == NULL) return NULL;
        while (*p < (state & mask)) p++;
-       if (*p == 0xffffffff) return NULL;                                      // reached end of list, no match
+       if (*p == END_OF_LIST_MARKER) return NULL;                                      // reached end of list, no match
        if ((*p & mask) == (state & mask)) return p;            // found a match.
        return NULL;                                                                            // no match
 } 
@@ -1031,7 +1052,7 @@ static bool all_other_first_bytes_match(uint32_t state, odd_even_t odd_even)
                                        uint16_t part_sum_a8 = (odd_even == ODD_STATE) ? r : s;
                                        uint32_t *p = find_first_state(state, mask, &partial_statelist[part_sum_a8], odd_even);
                                        if (p != NULL) {
-                                               while ((state & mask) == (*p & mask) && (*p != 0xffffffff)) {
+                                               while ((state & mask) == (*p & mask) && (*p != END_OF_LIST_MARKER)) {
                                                        if (remaining_bits_match(j, bytes_diff, state, (state&0x00fffff0) | *p, odd_even)) {
                                                                found_match = true;
                                                                // if ((odd_even == ODD_STATE && state == test_state_odd)
@@ -1089,7 +1110,7 @@ static bool all_bit_flips_match(uint32_t state, odd_even_t odd_even)
                        bool found_match = false;
                        uint32_t *p = find_first_state(state, mask, &statelist_bitflip, 0);
                        if (p != NULL) {
-                               while ((state & mask) == (*p & mask) && (*p != 0xffffffff)) {
+                               while ((state & mask) == (*p & mask) && (*p != END_OF_LIST_MARKER)) {
                                        if (remaining_bits_match(j, bytes_diff, state, (state&0x00fffff0) | *p, odd_even)) {
                                                found_match = true;
                                                // if ((odd_even == ODD_STATE && state == test_state_odd)
@@ -1162,11 +1183,11 @@ static int add_matching_states(statelist_t *candidates, uint16_t part_sum_a0, ui
                return 4;
        }
        uint32_t *add_p = candidates->states[odd_even]; 
-       for (uint32_t *p1 = partial_statelist[part_sum_a0].states[odd_even]; *p1 != 0xffffffff; p1++) {
+       for (uint32_t *p1 = partial_statelist[part_sum_a0].states[odd_even]; *p1 != END_OF_LIST_MARKER; p1++) {
                uint32_t search_mask = 0x000ffff0;
                uint32_t *p2 = find_first_state((*p1 << 4), search_mask, &partial_statelist[part_sum_a8], odd_even);
                if (p2 != NULL) {
-                       while (((*p1 << 4) & search_mask) == (*p2 & search_mask) && *p2 != 0xffffffff) {
+                       while (((*p1 << 4) & search_mask) == (*p2 & search_mask) && *p2 != END_OF_LIST_MARKER) {
                                if ((nonces[best_first_bytes[0]].BitFlip[odd_even] && find_first_state((*p1 << 4) | *p2, 0x000fffff, &statelist_bitflip, 0))
                                        || !nonces[best_first_bytes[0]].BitFlip[odd_even]) {
                                if (all_other_first_bytes_match((*p1 << 4) | *p2, odd_even)) {
@@ -1181,7 +1202,7 @@ static int add_matching_states(statelist_t *candidates, uint16_t part_sum_a0, ui
        }
 
        // set end of list marker and len
-       *add_p = 0xffffffff
+       *add_p = END_OF_LIST_MARKER
        candidates->len[odd_even] = add_p - candidates->states[odd_even];
 
        candidates->states[odd_even] = realloc(candidates->states[odd_even], sizeof(uint32_t) * (candidates->len[odd_even] + 1));
@@ -1211,7 +1232,7 @@ static statelist_t *add_more_candidates(statelist_t *current_candidates)
        return new_candidates;
 }
 
-static void TestIfKeyExists(uint64_t key)
+static bool TestIfKeyExists(uint64_t key)
 {
        struct Crypto1State *pcs;
        pcs = crypto1_create(key);
@@ -1227,14 +1248,14 @@ static void TestIfKeyExists(uint64_t key)
                bool found_even = false;
                uint32_t *p_odd = p->states[ODD_STATE];
                uint32_t *p_even = p->states[EVEN_STATE];
-               while (*p_odd != 0xffffffff) {
+               while (*p_odd != END_OF_LIST_MARKER) {
                        if ((*p_odd & 0x00ffffff) == state_odd) {
                                found_odd = true;
                                break;
                        }
                        p_odd++;
                }
-               while (*p_even != 0xffffffff) {
+               while (*p_even != END_OF_LIST_MARKER) {
                        if ((*p_even & 0x00ffffff) == state_even) {
                                found_even = true;
                        }
@@ -1242,15 +1263,17 @@ static void TestIfKeyExists(uint64_t key)
                }
                count += (p_odd - p->states[ODD_STATE]) * (p_even - p->states[EVEN_STATE]);
                if (found_odd && found_even) {
-                       PrintAndLog("Key Found after testing %lld (2^%1.1f) out of %lld (2^%1.1f) keys. A brute force would have taken approx %lld minutes.", 
-                               count, log(count)/log(2), 
-                               maximum_states, log(maximum_states)/log(2),
-                               (count>>23)/60);
+                       PrintAndLog("Key Found after testing %lld (2^%1.1f) out of %lld (2^%1.1f) keys. ", 
+                               count,
+                               log(count)/log(2), 
+                               maximum_states,
+                               log(maximum_states)/log(2)
+                               );
                        if (write_stats) {
                                fprintf(fstats, "1\n");
                        }
                        crypto1_destroy(pcs);
-                       return;
+                       return true;
                }
        }
 
@@ -1259,9 +1282,11 @@ static void TestIfKeyExists(uint64_t key)
                fprintf(fstats, "0\n");
        }
        crypto1_destroy(pcs);
+
+       return false;
 }
 
-static void generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
+static bool generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
 {
        printf("Generating crypto1 state candidates... \n");
        
@@ -1275,6 +1300,7 @@ static void generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                        }
                }
        }
+
        printf("Number of possible keys with Sum(a0) = %d: %"PRIu64" (2^%1.1f)\n", sum_a0, maximum_states, log(maximum_states)/log(2.0));
        
        init_statelist_cache();
@@ -1298,7 +1324,7 @@ static void generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                                                                } else {
                                                                        current_candidates->len[EVEN_STATE] = 0;
                                                                        uint32_t *p = current_candidates->states[EVEN_STATE] = malloc(sizeof(uint32_t));
-                                                                       *p = 0xffffffff;
+                                                                       *p = END_OF_LIST_MARKER;
                                                                }
                                                        } else {
                                                                add_matching_states(current_candidates, q, s, EVEN_STATE);
@@ -1307,7 +1333,7 @@ static void generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                                                                } else {
                                                                        current_candidates->len[ODD_STATE] = 0;
                                                                        uint32_t *p = current_candidates->states[ODD_STATE] = malloc(sizeof(uint32_t));
-                                                                       *p = 0xffffffff;
+                                                                       *p = END_OF_LIST_MARKER;
                                                                }
                                                        }
                                                        //printf("Odd  state candidates: %6d (2^%0.1f)\n", current_candidates->len[ODD_STATE], log(current_candidates->len[ODD_STATE])/log(2)); 
@@ -1319,19 +1345,22 @@ static void generate_candidates(uint16_t sum_a0, uint16_t sum_a8)
                }
        }                                       
 
-       
        maximum_states = 0;
        for (statelist_t *sl = candidates; sl != NULL; sl = sl->next) {
                maximum_states += (uint64_t)sl->len[ODD_STATE] * sl->len[EVEN_STATE];
        }
-       printf("Number of remaining possible keys: %"PRIu64" (2^%1.1f)\n", maximum_states, log(maximum_states)/log(2.0));
+       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) {
                if (maximum_states != 0) {
-                       fprintf(fstats, "%1.1f;", log(maximum_states)/log(2.0));
+                       fprintf(fstats, "%1.1f;", kcalc);
                } else {
                        fprintf(fstats, "%1.1f;", 0.0);
                }
        }
+       if (kcalc < 39.00f) return true;
+
+       return false;
 }
 
 static void    free_candidates_memory(statelist_t *sl)
@@ -1468,7 +1497,7 @@ static const uint64_t crack_states_bitsliced(statelist_t *p){
         const bitslice_value_t odd_feedback = odd_feedback_bit ? bs_ones.value : bs_zeroes.value;
 
         for(size_t block_idx = 0; block_idx < bitsliced_blocks; ++block_idx){
-            const bitslice_t const * restrict bitsliced_even_state = bitsliced_even_states[block_idx];
+            bitslice_t const * restrict bitsliced_even_state = bitsliced_even_states[block_idx];
             size_t state_idx;
             // set even bits
             for(state_idx = 0; state_idx < STATE_SIZE-ROLLBACK_SIZE; state_idx+=2){
@@ -1624,72 +1653,84 @@ static void* crack_states_thread(void* x){
     return NULL;
 }
 
-static void brute_force(void)
+static bool brute_force(void)
 {
+       bool ret = false;
        if (known_target_key != -1) {
                PrintAndLog("Looking for known target key in remaining key space...");
-               TestIfKeyExists(known_target_key);
+               ret = TestIfKeyExists(known_target_key);
        } else {
-        PrintAndLog("Brute force phase starting.");
-        time_t start, end;
-        time(&start);
-        keys_found = 0;
+               PrintAndLog("Brute force phase starting.");
+               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((best_first_bytes[0]<<24)^cuid, bitsliced_rollback_byte, 8);
-                       
-        PrintAndLog("Bitslicing nonces...");
-        for(size_t tests = 0; tests < NONCE_TESTS; tests++){
-            uint32_t test_nonce = brute_force_nonces[tests]->nonce_enc;
-            uint8_t test_parity = brute_force_nonces[tests]->par_enc;
-            // pre-xor the uid into the decrypted nonces, and also pre-xor the cuid parity into the encrypted parity bits - otherwise an exta xor is required in the decryption routine
-            crypto1_bs_bitslice_value32(cuid^test_nonce, bitsliced_encrypted_nonces[tests], 32);
-            // convert to 32 bit little-endian
-            crypto1_bs_bitslice_value32(rev32( ~(test_parity ^ ~(parity(cuid>>24 & 0xff)<<3 | parity(cuid>>16 & 0xff)<<2 | parity(cuid>>8 & 0xff)<<1 | parity(cuid&0xff)))), bitsliced_encrypted_parity_bits[tests], 4);
+
+               PrintAndLog("Bitslicing nonces...");
+               for(size_t tests = 0; tests < NONCE_TESTS; tests++){
+                       uint32_t test_nonce = brute_force_nonces[tests]->nonce_enc;
+                       uint8_t test_parity = brute_force_nonces[tests]->par_enc;
+                       // pre-xor the uid into the decrypted nonces, and also pre-xor the cuid parity into the encrypted parity bits - otherwise an exta xor is required in the decryption routine
+                       crypto1_bs_bitslice_value32(cuid^test_nonce, bitsliced_encrypted_nonces[tests], 32);
+                       // convert to 32 bit little-endian
+                       crypto1_bs_bitslice_value32(rev32( ~(test_parity ^ ~(parity(cuid>>24 & 0xff)<<3 | parity(cuid>>16 & 0xff)<<2 | parity(cuid>>8 & 0xff)<<1 | parity(cuid&0xff)))), bitsliced_encrypted_parity_bits[tests], 4);
                }
-        total_states_tested = 0;
+               total_states_tested = 0;
 
-        // count number of states to go
-        bucket_count = 0;
-        for (statelist_t *p = candidates; p != NULL; p = p->next) {
-            buckets[bucket_count] = p;
-            bucket_count++;
-        }
+               // count number of states to go
+               bucket_count = 0;
+               for (statelist_t *p = candidates; p != NULL; p = p->next) {
+                       buckets[bucket_count] = p;
+                       bucket_count++;
+               }
 
 #ifndef __WIN32
-        thread_count = sysconf(_SC_NPROCESSORS_CONF);
+               thread_count = sysconf(_SC_NPROCESSORS_CONF);
                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
-        PrintAndLog("Starting %u cracking threads to search %u buckets containing a total of %"PRIu32" states...", thread_count, bucket_count, maximum_states);
-               
-        for(size_t i = 0; i < thread_count; i++){
-            pthread_create(&threads[i], NULL, crack_states_thread, (void*) i);
-        }
-        for(size_t i = 0; i < thread_count; i++){
-            pthread_join(threads[i], 0);
-        }
+               pthread_t threads[thread_count];
 
-        time(&end);
-        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);
+               // enumerate states using all hardware threads, each thread handles one bucket
+               PrintAndLog("Starting %u cracking threads to search %u buckets containing a total of %"PRIu64" states...", thread_count, bucket_count, maximum_states);
+
+               for(size_t i = 0; i < thread_count; i++){
+                       pthread_create(&threads[i], NULL, crack_states_thread, (void*) i);
+               }
+               for(size_t i = 0; i < thread_count; i++){
+                       pthread_join(threads[i], 0);
+               }
+
+               time(&end);
+               double elapsed_time = difftime(end, start);
+
+               if(keys_found){
+                       PrintAndLog("Success! Tested %"PRIu32" states, found %u keys after %.f 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);
+                       known_target_key = foundkey;
+
+                       ret = TestIfKeyExists(known_target_key);
+
+                       PrintAndLog("Check if key is found in the keyspace: %d", ret);
+
+                       ret = true;
+               } else {
+                       PrintAndLog("Fail! Tested %"PRIu32" states, in %.f seconds", total_states_tested, elapsed_time);
                }
-        // reset this counter for the next call
-        nonces_to_bruteforce = 0;
+
+               // reset this counter for the next call
+               nonces_to_bruteforce = 0;
        }
+
+       return ret;
 }
 
 int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests) 
@@ -1760,20 +1801,22 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
                        // best_first_bytes[7],
                        // 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();
+               //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);
                candidates = NULL;
-       }       
+       }
        return 0;
 }
 
Impressum, Datenschutz