From 9d590832a18fd34abd2c7966f14a30f58e87e1a1 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 6 May 2016 19:09:29 +0200 Subject: [PATCH] FIX: This tries to fix the memalign issued on MAC OS X, which it doesn't have. However its standard Malloc is already 16byte memaligned. ref: http://stackoverflow.com/questions/196329/osx-lacks-memalign --- client/cmdhfmfhard.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c index 427f503d..2cec9b7c 100644 --- a/client/cmdhfmfhard.c +++ b/client/cmdhfmfhard.c @@ -814,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); } @@ -1400,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 defined(__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 ) { @@ -1744,8 +1747,8 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc //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], -- 2.39.5