From 01a191f3858e1df8581cb98075fce1b3597f6724 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 1 Oct 2024 09:52:46 +0200 Subject: [PATCH] style --- armsrc/lfops.c | 24 +++++++++++++++++++----- client/src/cmdhficlass.c | 8 ++++---- doc/commands.json | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/armsrc/lfops.c b/armsrc/lfops.c index 1748522d4..1fba4a381 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -2593,13 +2593,13 @@ static void SendForward(uint8_t fwd_bit_count, bool fast) { // 32FC * 8us == 256us / 21.3 == 12.018 steps. ok // 16FC * 8us == 128us / 21.3 == 6.009 steps. ok #ifndef EM_START_GAP -#define EM_START_GAP 55*8 +#define EM_START_GAP (55 * 8) #endif fwd_write_ptr = forwardLink_data; fwd_bit_sz = fwd_bit_count; - if (! fast) { + if (fast == false) { // Set up FPGA, 125kHz or 95 divisor LFSetupFPGAForADC(LF_DIVISOR_125, true); } @@ -2639,16 +2639,21 @@ void EM4xBruteforce(uint32_t start_pwd, uint32_t n, bool ledcontrol) { FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); WaitMS(20); if (ledcontrol) LED_A_ON(); + LFSetupFPGAForADC(LF_DIVISOR_125, true); + uint32_t candidates_found = 0; for (uint32_t pwd = start_pwd; pwd < 0xFFFFFFFF; pwd++) { + if (((pwd - start_pwd) & 0x3F) == 0x00) { + WDT_HIT(); if (BUTTON_PRESS() || data_available()) { Dbprintf("EM4x05 Bruteforce Interrupted"); break; } } + // Report progress every 256 attempts if (((pwd - start_pwd) & 0xFF) == 0x00) { Dbprintf("Trying: %06Xxx", pwd >> 8); @@ -2662,7 +2667,9 @@ void EM4xBruteforce(uint32_t start_pwd, uint32_t n, bool ledcontrol) { WaitUS(400); DoPartialAcquisition(0, false, 350, 1000, ledcontrol); + uint8_t *mem = BigBuf_get_addr(); + if (mem[334] < 128) { candidates_found++; Dbprintf("Password candidate: " _GREEN_("%08X"), pwd); @@ -2671,6 +2678,7 @@ void EM4xBruteforce(uint32_t start_pwd, uint32_t n, bool ledcontrol) { break; } } + // Beware: if smaller, tag might not have time to be back in listening state yet WaitMS(1); } @@ -2719,7 +2727,9 @@ void EM4xReadWord(uint8_t addr, uint32_t pwd, uint8_t usepwd, bool ledcontrol) { * 0000 1010 ok * 0000 0001 fail **/ - if (usepwd) EM4xLoginEx(pwd); + if (usepwd) { + EM4xLoginEx(pwd); + } forward_ptr = forwardLink_data; uint8_t len = Prepare_Cmd(FWD_CMD_READ); @@ -2754,7 +2764,9 @@ void EM4xWriteWord(uint8_t addr, uint32_t data, uint32_t pwd, uint8_t usepwd, bo * 0000 1010 ok. * 0000 0001 fail **/ - if (usepwd) EM4xLoginEx(pwd); + if (usepwd) { + EM4xLoginEx(pwd); + } forward_ptr = forwardLink_data; uint8_t len = Prepare_Cmd(FWD_CMD_WRITE); @@ -2797,7 +2809,9 @@ void EM4xProtectWord(uint32_t data, uint32_t pwd, uint8_t usepwd, bool ledcontro * 0000 1010 ok. * 0000 0001 fail **/ - if (usepwd) EM4xLoginEx(pwd); + if (usepwd) { + EM4xLoginEx(pwd); + } forward_ptr = forwardLink_data; uint8_t len = Prepare_Cmd(FWD_CMD_PROTECT); diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index 5bf7aff71..36d1622d5 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -295,9 +295,9 @@ static int generate_config_card(const iclass_config_card_item_t *o, uint8_t *ke memcpy(&configcard.conf, "\xFF\xFF\xFF\xFF\xF9\xFF\xFF\xBC", 8); memcpy(&configcard.epurse, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 8); - if(got_krki){ + if (got_krki) { HFiClassCalcDivKey(configcard.csn, card_key, configcard.key_d, use_elite); - }else if (!got_krki){ + } else if (!got_krki) { // defaulting to AA1 ki 0 HFiClassCalcDivKey(configcard.csn, iClass_Key_Table[0], configcard.key_d, use_elite); } @@ -311,9 +311,9 @@ static int generate_config_card(const iclass_config_card_item_t *o, uint8_t *ke if (res == PM3_SUCCESS) { cc = &iclass_last_known_card; // calc diversified key for selected card - if(got_krki){ + if (got_krki) { HFiClassCalcDivKey(cc->csn, card_key, cc->key_d, use_elite); - }else if (!got_krki){ + } else if (!got_krki) { // defaulting to AA1 ki 0 HFiClassCalcDivKey(cc->csn, iClass_Key_Table[0], cc->key_d, false); } diff --git a/doc/commands.json b/doc/commands.json index 7fa514bc2..75c547996 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -12956,6 +12956,6 @@ "metadata": { "commands_extracted": 747, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2024-09-30T08:35:18" + "extracted_on": "2024-10-01T07:52:00" } }