diff --git a/client/cmdhf15.c b/client/cmdhf15.c index b599023a9..9ef4129c1 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -748,7 +748,7 @@ int CmdHF15Dump(const char*Cmd) { retry = 0; blocknum++; - PrintAndLogEx(NORMAL, "."); fflush(stdout); + printf("."); fflush(stdout); } } PrintAndLogEx(NORMAL, "\n"); diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c index c76fa7103..7e3db8bc5 100644 --- a/client/cmdhficlass.c +++ b/client/cmdhficlass.c @@ -2043,8 +2043,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) { while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) { timeout++; - PrintAndLogEx(NORMAL, "."); - fflush(stdout); + printf("."); fflush(stdout); if (timeout > 120) { PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(WARNING, "no response from Proxmark. Aborting..."); goto out; diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 5019b7eb6..2615291c2 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -2501,7 +2501,7 @@ int CmdHF14AMfESave(const char *Cmd) { for (j = 0; j < 16; j++) fprintf(f, "%02X", buf[j]); fprintf(f,"\n"); - PrintAndLogEx(NORMAL, "."); fflush(stdout); + printf("."); fflush(stdout); } PrintAndLogEx(NORMAL, "\n"); fclose(f); @@ -2916,7 +2916,7 @@ int CmdHF14AMfCSave(const char *Cmd) { PrintAndLogEx(WARNING, "Cant set emul block: %d", i); return 3; } - PrintAndLogEx(NORMAL, "."); fflush(stdout); + printf("."); fflush(stdout); } PrintAndLogEx(NORMAL, "\n"); return 0; diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index 01cc1e348..15e2f3d31 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -2106,8 +2106,7 @@ int CmdHF14AMfURestore(const char *Cmd){ clearCommandBuffer(); SendCommand(&c); wait4response(b); - PrintAndLogEx(NORMAL, "."); - fflush(stdout); + printf("."); fflush(stdout); } PrintAndLogEx(NORMAL, "\n"); diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h index 0c39ff094..41e18d0ec 100644 --- a/client/cmdhfmfu.h +++ b/client/cmdhfmfu.h @@ -68,6 +68,7 @@ uint16_t ul_ev1_packgenA(uint8_t* uid); uint16_t ul_ev1_packgenB(uint8_t* uid); uint16_t ul_ev1_packgenC(uint8_t* uid); uint16_t ul_ev1_packgenD(uint8_t* uid); +uint16_t ul_ev1_packgen_VCNEW(uint8_t* uid, uint32_t pwd); uint32_t ul_ev1_otpgenA(uint8_t* uid); diff --git a/client/cmdlf.c b/client/cmdlf.c index affa71df6..c33b2ed62 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -421,7 +421,7 @@ int CmdLFSim(const char *Cmd) { clearCommandBuffer(); SendCommand(&c); WaitForResponse(CMD_ACK, NULL); - PrintAndLogEx(NORMAL, "."); + printf("."); fflush(stdout); } PrintAndLogEx(NORMAL, "Simulating"); diff --git a/client/cmdlfio.h b/client/cmdlfio.h index c718cef1d..c991f451b 100644 --- a/client/cmdlfio.h +++ b/client/cmdlfio.h @@ -10,13 +10,12 @@ #include "proxmark3.h" // Definitions, USB controls, etc #include "ui.h" // PrintAndLog #include "cmdparser.h" // CmdsParse, CmdsHelp -#include "lfdemod.h" // parityTest +#include "lfdemod.h" // parityTest, bitbytes_to_byte #include "util.h" // weigandparity #include "protocols.h" // for T55xx config register definitions #include "data.h" #include "cmdmain.h" #include "cmddata.h" -#include "lfdemod.h" // bitbytes_to_byte extern int CmdLFIO(const char *Cmd); extern int CmdIOProxDemod(const char *Cmd); diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 897fadc0e..7f6c6ac93 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -1621,8 +1621,7 @@ int CmdT55xxBruteForce(const char *Cmd) { while ((!found) && (i <= end_password)){ - PrintAndLogEx(NORMAL, "."); - fflush(stdout); + printf("."); fflush(stdout); if (IsCancelled()) { free(keyBlock); diff --git a/client/flash.c b/client/flash.c index 8189af306..ff661fd0e 100644 --- a/client/flash.c +++ b/client/flash.c @@ -437,8 +437,7 @@ int flash_write(flash_file_t *ctx) { baddr += block_size; length -= block_size; block++; - fprintf(stdout, "."); - fflush(stdout); + fprintf(stdout, "."); fflush(stdout); } fprintf(stdout, " OK\n"); fflush(stdout); diff --git a/client/flasher.c b/client/flasher.c index 3ccdb1b21..63af6144e 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -135,7 +135,7 @@ int main(int argc, char **argv) { fprintf(stdout, "Waiting for Proxmark to appear on %s", serial_port_name); do { msleep(500); - fprintf(stderr, "."); + fprintf(stderr, "."); fflush(stdout); } while (!OpenProxmark()); fprintf(stdout, " Found.\n"); diff --git a/client/hid-flasher/flash.c b/client/hid-flasher/flash.c index 7f03ebab6..8e932da10 100644 --- a/client/hid-flasher/flash.c +++ b/client/hid-flasher/flash.c @@ -336,7 +336,7 @@ static int enter_bootloader(void) msleep(1000); while (!OpenProxmark(0)) { msleep(1000); - fprintf(stderr, "."); + fprintf(stderr, "."); fflush(stdout); } fprintf(stderr," Found.\n"); @@ -449,7 +449,7 @@ int flash_write(flash_file_t *ctx) baddr += block_size; length -= block_size; block++; - fprintf(stderr, "."); + fprintf(stderr, "."); fflush(stdout); } fprintf(stderr, " OK\n"); } diff --git a/client/hid-flasher/flasher.c b/client/hid-flasher/flasher.c index ac7df69e0..f9cd7f0d2 100644 --- a/client/hid-flasher/flasher.c +++ b/client/hid-flasher/flasher.c @@ -60,7 +60,7 @@ int main(int argc, char **argv) fprintf(stderr, "Waiting for Proxmark to appear on USB..."); while (!OpenProxmark(1)) { msleep(1000); - fprintf(stderr, "."); + fprintf(stderr, "."); fflush(stdout); } fprintf(stderr, " Found.\n"); diff --git a/client/mifarehost.c b/client/mifarehost.c index 75d9d099a..5789e6544 100644 --- a/client/mifarehost.c +++ b/client/mifarehost.c @@ -21,8 +21,8 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) { // message PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n"); - PrintAndLogEx(SUCCESS, "executing Darkside attack. Expected execution time: 25sec on average\n"); - PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n"); + PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average"); + PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client."); PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n"); while (true) { @@ -151,8 +151,7 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) { timeout++; - PrintAndLogEx(NORMAL, "."); - fflush(stdout); + printf("."); fflush(stdout); // max timeout for one chunk of 85keys, 60*3sec = 180seconds // s70 with 40*2 keys to check, 80*85 = 6800 auth. // takes about 97s, still some margin before abort @@ -915,7 +914,7 @@ int detect_classic_nackbug(bool verbose){ while (true) { if (term) { - PrintAndLogEx(NORMAL, "."); + printf("."); } else { printf( #if defined(__linux__) || (__APPLE__) diff --git a/client/proxmark3.c b/client/proxmark3.c index 184c42cbd..551262afa 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -483,8 +483,7 @@ int main(int argc, char* argv[]) { do { sp = uart_open(argv[1]); msleep(500); - PrintAndLogEx(NORMAL, "."); - fflush(stdout); + printf("."); fflush(stdout); } while (++openCount < 30 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT)); PrintAndLogEx(NORMAL, "\n"); }