From ba45da1c2883818fddac2a198ef45dc893674a17 Mon Sep 17 00:00:00 2001 From: "osboxes.org" Date: Wed, 10 Apr 2019 09:38:33 +0200 Subject: [PATCH] style --- client/cmdhfepa.c | 6 +++--- client/cmdhfmfhard.c | 36 ++++++++++++++++++------------------ client/cmdlfpyramid.c | 14 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c index ecd185783..b5f60c403 100644 --- a/client/cmdhfepa.c +++ b/client/cmdhfepa.c @@ -81,11 +81,11 @@ int CmdHFEPAPACEReplay(const char *Cmd) { while (Cmd[skip] != ' ' && Cmd[skip] != '\0') { // convert scan_return = sscanf(Cmd + skip, - "%2X%n", + "%2X%n", (unsigned int *)(apdus[i] + apdu_lengths[i]), &skip_add - ); - + ); + if (scan_return < 1) { PrintAndLogEx(NORMAL, (char *)usage_msg); PrintAndLogEx(WARNING, "Not enough APDUs! Try again!"); diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c index 787a8f8c8..683879fec 100644 --- a/client/cmdhfmfhard.c +++ b/client/cmdhfmfhard.c @@ -1664,7 +1664,7 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even bool found_match = false; for (uint8_t remaining_bits = 0; remaining_bits <= (~mask & 0xff); remaining_bits++) { if (remaining_bits_match(num_common, bytes_diff, state, (state & mask) | remaining_bits, odd_even)) { - + #ifdef DEBUG_KEY_ELIMINATION if (bitflips_match(byte2, (state & mask) | remaining_bits, odd_even, true)) { #else @@ -1675,9 +1675,9 @@ static bool all_bitflips_match(uint8_t byte, uint32_t state, odd_even_t odd_even } } } - + if (!found_match) { - + #ifdef DEBUG_KEY_ELIMINATION if (known_target_key != -1 && state == test_state[odd_even]) { PrintAndLogEx(NORMAL, "all_bitflips_match() 1st Byte: %s test state (0x%06x): Eliminated. Bytes = %02x, %02x, Common Bits = %d\n", @@ -2084,10 +2084,10 @@ static uint16_t SumProperty(struct Crypto1State *s) { } static void Tests() { - + if (known_target_key == -1) return; - + for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) { uint32_t *bitset = nonces[best_first_bytes[0]].states_bitarray[odd_even]; if (!test_bit24(bitset, test_state[odd_even])) { @@ -2106,10 +2106,10 @@ static void Tests() { } static void Tests2(void) { - + if (known_target_key == -1) return; - + for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) { uint32_t *bitset = nonces[best_first_byte_smallest_bitarray].states_bitarray[odd_even]; if (!test_bit24(bitset, test_state[odd_even])) { @@ -2118,7 +2118,7 @@ static void Tests2(void) { best_first_byte_smallest_bitarray); } } - + for (odd_even_t odd_even = EVEN_STATE; odd_even <= ODD_STATE; odd_even++) { uint32_t *bitset = all_bitflips_bitarray[odd_even]; if (!test_bit24(bitset, test_state[odd_even])) { @@ -2167,7 +2167,7 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0); sprintf(progress_text, "Starting Test #%" PRIu32 " ...", i + 1); hardnested_print_progress(0, progress_text, (float)(1LL << 47), 0); - + if (trgkey != NULL) { known_target_key = bytes_to_num(trgkey, 6); } else { @@ -2250,17 +2250,17 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc } #ifdef DEBUG_KEY_ELIMINATION fprintf(fstats, "%1.1f;%1.0f;%c;%s\n", - log(num_keys_tested) / log(2.0), - (float)num_keys_tested / brute_force_per_second, - key_found ? 'Y' : 'N', - failstr - ); + log(num_keys_tested) / log(2.0), + (float)num_keys_tested / brute_force_per_second, + key_found ? 'Y' : 'N', + failstr + ); #else fprintf(fstats, "%1.0f;%d\n", - log(num_keys_tested) / log(2.0), - (float)num_keys_tested / brute_force_per_second, - key_found - ); + log(num_keys_tested) / log(2.0), + (float)num_keys_tested / brute_force_per_second, + key_found + ); #endif free_nonces_memory(); diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c index 92e7809b2..27c80e7f3 100644 --- a/client/cmdlfpyramid.c +++ b/client/cmdlfpyramid.c @@ -222,13 +222,13 @@ int CmdPyramidDemod(const char *Cmd) { fc = bytebits_to_byte(bits + 53, 10); cardnum = bytebits_to_byte(bits + 63, 32); PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo); -/* - } else if (fmtLen > 32) { - cardnum = bytebits_to_byte(bits + 81, 16); - //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32); - //code2 = bytebits_to_byte(bits+(size-32),32); - PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); - */ + /* + } else if (fmtLen > 32) { + cardnum = bytebits_to_byte(bits + 81, 16); + //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32); + //code2 = bytebits_to_byte(bits+(size-32),32); + PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); + */ } else { cardnum = bytebits_to_byte(bits + 81, 16); //code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);