X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2e350b19f7f107a8d7d7d0f12753072be1e991a3..cc70889743ed9b2820713e2a912ec030f2a496bb:/client/cmdhfmfhard.c
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 0df1f157..2af03f08 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -30,14 +30,16 @@
#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>
-// 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
+#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,
@@ -73,7 +75,6 @@ static const float p_K[257] = { // the probability that a random nonce has a Su
0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000,
0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000,
0.0290 };
-
typedef struct noncelistentry {
uint32_t nonce_enc;
@@ -92,7 +93,6 @@ typedef struct noncelist {
float score1, score2;
} noncelist_t;
-
static size_t nonces_to_bruteforce = 0;
static noncelistentry_t *brute_force_nonces[256];
static uint32_t cuid = 0;
@@ -130,10 +130,8 @@ typedef struct {
static partial_indexed_statelist_t partial_statelist[17];
static partial_indexed_statelist_t statelist_bitflip;
-
static statelist_t *candidates = NULL;
-
static int add_nonce(uint32_t nonce_enc, uint8_t par_enc)
{
uint8_t first_byte = nonce_enc >> 24;
@@ -203,7 +201,6 @@ static void init_nonce_memory(void)
num_good_first_bytes = 0;
}
-
static void free_nonce_list(noncelistentry_t *p)
{
if (p == NULL) {
@@ -448,32 +445,31 @@ static void Tests()
// crypto1_destroy(pcs);
-
// printf("\nTests: number of states with BitFlipProperty: %d, (= %1.3f%% of total states)\n", statelist_bitflip.len[0], 100.0 * statelist_bitflip.len[0] / (1<<20));
- printf("\nTests: Actual BitFlipProperties odd/even:\n");
- for (uint16_t i = 0; i < 256; i++) {
- printf("[%02x]:%c ", i, nonces[i].BitFlip[ODD_STATE]?'o':nonces[i].BitFlip[EVEN_STATE]?'e':' ');
- if (i % 8 == 7) {
- printf("\n");
- }
- }
+ // printf("\nTests: Actual BitFlipProperties odd/even:\n");
+ // for (uint16_t i = 0; i < 256; i++) {
+ // printf("[%02x]:%c ", i, nonces[i].BitFlip[ODD_STATE]?'o':nonces[i].BitFlip[EVEN_STATE]?'e':' ');
+ // if (i % 8 == 7) {
+ // printf("\n");
+ // }
+ // }
- printf("\nTests: Sorted First Bytes:\n");
- for (uint16_t i = 0; i < 256; i++) {
- uint8_t best_byte = best_first_bytes[i];
- printf("#%03d Byte: %02x, n = %3d, k = %3d, Sum(a8): %3d, Confidence: %5.1f%%, Bitflip: %c\n",
- //printf("#%03d Byte: %02x, n = %3d, k = %3d, Sum(a8): %3d, Confidence: %5.1f%%, Bitflip: %c, score1: %1.5f, score2: %1.0f\n",
- i, best_byte,
- nonces[best_byte].num,
- nonces[best_byte].Sum,
- nonces[best_byte].Sum8_guess,
- nonces[best_byte].Sum8_prob * 100,
- nonces[best_byte].BitFlip[ODD_STATE]?'o':nonces[best_byte].BitFlip[EVEN_STATE]?'e':' '
- //nonces[best_byte].score1,
- //nonces[best_byte].score2
- );
- }
+ // printf("\nTests: Sorted First Bytes:\n");
+ // for (uint16_t i = 0; i < 256; i++) {
+ // uint8_t best_byte = best_first_bytes[i];
+ // printf("#%03d Byte: %02x, n = %3d, k = %3d, Sum(a8): %3d, Confidence: %5.1f%%, Bitflip: %c\n",
+ // //printf("#%03d Byte: %02x, n = %3d, k = %3d, Sum(a8): %3d, Confidence: %5.1f%%, Bitflip: %c, score1: %1.5f, score2: %1.0f\n",
+ // i, best_byte,
+ // nonces[best_byte].num,
+ // nonces[best_byte].Sum,
+ // nonces[best_byte].Sum8_guess,
+ // nonces[best_byte].Sum8_prob * 100,
+ // nonces[best_byte].BitFlip[ODD_STATE]?'o':nonces[best_byte].BitFlip[EVEN_STATE]?'e':' '
+ // //nonces[best_byte].score1,
+ // //nonces[best_byte].score2
+ // );
+ // }
// printf("\nTests: parity performance\n");
// time_t time1p = clock();
@@ -613,11 +609,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) {
@@ -648,7 +644,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;
}
@@ -822,7 +817,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);
}
@@ -875,10 +869,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;
@@ -927,7 +921,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;
}
}
@@ -953,7 +947,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));
}
@@ -963,7 +957,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
}
@@ -1041,7 +1035,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)
@@ -1099,7 +1093,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)
@@ -1172,11 +1166,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)) {
@@ -1191,7 +1185,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));
@@ -1237,14 +1231,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;
}
@@ -1252,10 +1246,12 @@ 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");
}
@@ -1308,7 +1304,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);
@@ -1317,11 +1313,11 @@ 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));
- printf("Even state candidates: %6d (2^%0.1f)\n", current_candidates->len[EVEN_STATE], log(current_candidates->len[EVEN_STATE])/log(2));
+ //printf("Odd state candidates: %6d (2^%0.1f)\n", current_candidates->len[ODD_STATE], log(current_candidates->len[ODD_STATE])/log(2));
+ //printf("Even state candidates: %6d (2^%0.1f)\n", current_candidates->len[EVEN_STATE], log(current_candidates->len[EVEN_STATE])/log(2));
}
}
}
@@ -1365,6 +1361,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];
@@ -1407,7 +1404,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 ) {
@@ -1614,8 +1615,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;
@@ -1628,7 +1629,7 @@ static void* crack_states_thread(void* x){
}
return NULL;
}
-#define _USE_32BIT_TIME_T
+
static void brute_force(void)
{
if (known_target_key != -1) {
@@ -1639,14 +1640,15 @@ 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);
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;
@@ -1655,7 +1657,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
@@ -1667,11 +1669,14 @@ static void brute_force(void)
#ifndef __WIN32
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);
+ 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);
@@ -1680,12 +1685,15 @@ static void brute_force(void)
pthread_join(threads[i], 0);
}
- 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);
- }
+ time(&end);
+ double elapsed_time = difftime(end, start);
+ PrintAndLog("ICE %.f seconds", elapsed_time);
+ 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 %.f seconds", total_states_tested, elapsed_time);
+ }
// reset this counter for the next call
nonces_to_bruteforce = 0;
}
@@ -1744,10 +1752,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],
@@ -1768,6 +1776,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
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);