From a68b8983f25260acd01c9cda44a3d39cf288e1cd Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 21 Apr 2020 01:56:51 +0200 Subject: [PATCH] make style --- armsrc/mifaresim.c | 4 ++-- client/src/cmdhfmfu.c | 24 ++++++++++++------------ client/src/cmdlfhitag.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c index 9fb0d9d5d..ecc0ee505 100644 --- a/armsrc/mifaresim.c +++ b/armsrc/mifaresim.c @@ -1258,7 +1258,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain, uint1 FpgaDisableTracing(); // NR AR ATTACK - // mfkey32 + // mfkey32 if (((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK) && (DBGLEVEL >= DBG_INFO)) { for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) { if (ar_nr_collected[i] == 2) { @@ -1274,7 +1274,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain, uint1 } } } - + // mfkey32 v2 for (uint8_t i = ATTACK_KEY_COUNT; i < ATTACK_KEY_COUNT * 2; i++) { if (ar_nr_collected[i] == 2) { diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 92887a1d1..0bfb73b65 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -2804,18 +2804,18 @@ static int CmdHF14AMfuOtpTearoff(const char *Cmd) { } } -/* TEMPORALLY DISABLED - uint8_t d0, d1, d2, d3; - d0 = *resp.data.asBytes; - d1 = *(resp.data.asBytes + 1); - d2 = *(resp.data.asBytes + 2); - d3 = *(resp.data.asBytes + 3); - if ((d0 != 0xFF) || (d1 != 0xFF) || (d2 != 0xFF) || (d3 = ! 0xFF)) { - PrintAndLogEx(NORMAL, "---------------------------------"); - PrintAndLogEx(NORMAL, " EFFECT AT: %d us", actualTime); - PrintAndLogEx(NORMAL, "---------------------------------\n"); - } -*/ + /* TEMPORALLY DISABLED + uint8_t d0, d1, d2, d3; + d0 = *resp.data.asBytes; + d1 = *(resp.data.asBytes + 1); + d2 = *(resp.data.asBytes + 2); + d3 = *(resp.data.asBytes + 3); + if ((d0 != 0xFF) || (d1 != 0xFF) || (d2 != 0xFF) || (d3 = ! 0xFF)) { + PrintAndLogEx(NORMAL, "---------------------------------"); + PrintAndLogEx(NORMAL, " EFFECT AT: %d us", actualTime); + PrintAndLogEx(NORMAL, "---------------------------------\n"); + } + */ actualTime += interval; } return PM3_SUCCESS; diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c index e5752f2d5..0d33fc281 100644 --- a/client/src/cmdlfhitag.c +++ b/client/src/cmdlfhitag.c @@ -22,14 +22,14 @@ static int CmdHelp(const char *Cmd); -static char* getHitagTypeStr(uint32_t uid) { +static char *getHitagTypeStr(uint32_t uid) { //uid s/n ******** - uint8_t type = (uid >> 4) & 0xF; - switch(type) { + uint8_t type = (uid >> 4) & 0xF; + switch (type) { case 1: return "PCF 7936"; case 2: - return "PCF 7946"; + return "PCF 7946"; case 3: return "PCF 7947"; case 4: