X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1c38049bcb76b08c0f6ee16f94fea7e767bfb1fd..2605eca35af13ad8246454530d602c7c5a72bf10:/client/cmdhfmfhard.c

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 15bdd566..12a36295 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -33,9 +33,6 @@
 #include <malloc.h>
 #include <assert.h>
 
-// uint32_t test_state_odd = 0;
-// uint32_t test_state_even = 0;
-
 #define CONFIDENCE_THRESHOLD	0.95		// Collect nonces until we are certain enough that the following brute force is successfull
 #define GOOD_BYTES_REQUIRED		28
 
@@ -817,7 +814,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);
 				}
@@ -1360,6 +1356,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];
@@ -1402,7 +1399,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 )	{
@@ -1609,8 +1610,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;
@@ -1640,8 +1641,8 @@ 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...");
         for(size_t tests = 0; tests < NONCE_TESTS; tests++){
             uint32_t test_nonce = brute_force_nonces[tests]->nonce_enc;
@@ -1650,7 +1651,7 @@ static void brute_force(void)
             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;
 
         // count number of states to go
@@ -1665,6 +1666,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,10 +1681,12 @@ static void brute_force(void)
 
         time(&end);
         unsigned long elapsed_time = difftime(end, start);
-        PrintAndLog("Tested %"PRIu32" states, found %u keys after %u seconds", total_states_tested, keys_found, elapsed_time);
-        if(!keys_found){
-            assert(total_states_tested == maximum_states);
-        }
+        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);
+		}
         // reset this counter for the next call
         nonces_to_bruteforce = 0;
 	}
@@ -1741,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],