X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ed69e099a15b4cf73610ba8646c8a06fa5431f43..04da5cd92bdf5cbdcec127961e2499121003655e:/client/cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index f4d46486..427f503d 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -1357,6 +1357,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];
@@ -1606,8 +1607,8 @@ static void* crack_states_thread(void* x){
 		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(&foundkey, key);
                 break;
             } else if(keys_found){
                 break;
@@ -1637,7 +1638,6 @@ static void brute_force(void)
         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...");
@@ -1663,6 +1663,7 @@ static void brute_force(void)
 		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
@@ -1679,6 +1680,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);
+			PrintAndLog("\nFound key: %012"PRIx64"\n", foundkey);
         } else {
 			PrintAndLog("Fail! Tested %"PRIu32" states, in %u seconds", total_states_tested, elapsed_time);
 		}
@@ -1740,7 +1742,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
 			}
 		}
 
-		Tests();
+		//Tests();
 
 		PrintAndLog("");
 		PrintAndLog("Sum(a0) = %d", first_byte_Sum);