mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 13:23:51 -07:00
chg: the dot progress is not logged anymore. Force fflush afterwards.
This commit is contained in:
parent
857bc8ab66
commit
24482211ad
14 changed files with 19 additions and 25 deletions
|
@ -748,7 +748,7 @@ int CmdHF15Dump(const char*Cmd) {
|
||||||
retry = 0;
|
retry = 0;
|
||||||
blocknum++;
|
blocknum++;
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "."); fflush(stdout);
|
printf("."); fflush(stdout);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PrintAndLogEx(NORMAL, "\n");
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
|
|
|
@ -2043,8 +2043,7 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
|
||||||
|
|
||||||
while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
|
while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
|
||||||
timeout++;
|
timeout++;
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf("."); fflush(stdout);
|
||||||
fflush(stdout);
|
|
||||||
if (timeout > 120) {
|
if (timeout > 120) {
|
||||||
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(WARNING, "no response from Proxmark. Aborting...");
|
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(WARNING, "no response from Proxmark. Aborting...");
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -2501,7 +2501,7 @@ int CmdHF14AMfESave(const char *Cmd) {
|
||||||
for (j = 0; j < 16; j++)
|
for (j = 0; j < 16; j++)
|
||||||
fprintf(f, "%02X", buf[j]);
|
fprintf(f, "%02X", buf[j]);
|
||||||
fprintf(f,"\n");
|
fprintf(f,"\n");
|
||||||
PrintAndLogEx(NORMAL, "."); fflush(stdout);
|
printf("."); fflush(stdout);
|
||||||
}
|
}
|
||||||
PrintAndLogEx(NORMAL, "\n");
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
@ -2916,7 +2916,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
|
||||||
PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
|
PrintAndLogEx(WARNING, "Cant set emul block: %d", i);
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
PrintAndLogEx(NORMAL, "."); fflush(stdout);
|
printf("."); fflush(stdout);
|
||||||
}
|
}
|
||||||
PrintAndLogEx(NORMAL, "\n");
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -2106,8 +2106,7 @@ int CmdHF14AMfURestore(const char *Cmd){
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
SendCommand(&c);
|
SendCommand(&c);
|
||||||
wait4response(b);
|
wait4response(b);
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf("."); fflush(stdout);
|
||||||
fflush(stdout);
|
|
||||||
}
|
}
|
||||||
PrintAndLogEx(NORMAL, "\n");
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,7 @@ uint16_t ul_ev1_packgenA(uint8_t* uid);
|
||||||
uint16_t ul_ev1_packgenB(uint8_t* uid);
|
uint16_t ul_ev1_packgenB(uint8_t* uid);
|
||||||
uint16_t ul_ev1_packgenC(uint8_t* uid);
|
uint16_t ul_ev1_packgenC(uint8_t* uid);
|
||||||
uint16_t ul_ev1_packgenD(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);
|
uint32_t ul_ev1_otpgenA(uint8_t* uid);
|
||||||
|
|
||||||
|
|
|
@ -421,7 +421,7 @@ int CmdLFSim(const char *Cmd) {
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
SendCommand(&c);
|
SendCommand(&c);
|
||||||
WaitForResponse(CMD_ACK, NULL);
|
WaitForResponse(CMD_ACK, NULL);
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf("."); fflush(stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "Simulating");
|
PrintAndLogEx(NORMAL, "Simulating");
|
||||||
|
|
|
@ -10,13 +10,12 @@
|
||||||
#include "proxmark3.h" // Definitions, USB controls, etc
|
#include "proxmark3.h" // Definitions, USB controls, etc
|
||||||
#include "ui.h" // PrintAndLog
|
#include "ui.h" // PrintAndLog
|
||||||
#include "cmdparser.h" // CmdsParse, CmdsHelp
|
#include "cmdparser.h" // CmdsParse, CmdsHelp
|
||||||
#include "lfdemod.h" // parityTest
|
#include "lfdemod.h" // parityTest, bitbytes_to_byte
|
||||||
#include "util.h" // weigandparity
|
#include "util.h" // weigandparity
|
||||||
#include "protocols.h" // for T55xx config register definitions
|
#include "protocols.h" // for T55xx config register definitions
|
||||||
#include "data.h"
|
#include "data.h"
|
||||||
#include "cmdmain.h"
|
#include "cmdmain.h"
|
||||||
#include "cmddata.h"
|
#include "cmddata.h"
|
||||||
#include "lfdemod.h" // bitbytes_to_byte
|
|
||||||
|
|
||||||
extern int CmdLFIO(const char *Cmd);
|
extern int CmdLFIO(const char *Cmd);
|
||||||
extern int CmdIOProxDemod(const char *Cmd);
|
extern int CmdIOProxDemod(const char *Cmd);
|
||||||
|
|
|
@ -1621,8 +1621,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
|
||||||
|
|
||||||
while ((!found) && (i <= end_password)){
|
while ((!found) && (i <= end_password)){
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf("."); fflush(stdout);
|
||||||
fflush(stdout);
|
|
||||||
|
|
||||||
if (IsCancelled()) {
|
if (IsCancelled()) {
|
||||||
free(keyBlock);
|
free(keyBlock);
|
||||||
|
|
|
@ -437,8 +437,7 @@ int flash_write(flash_file_t *ctx) {
|
||||||
baddr += block_size;
|
baddr += block_size;
|
||||||
length -= block_size;
|
length -= block_size;
|
||||||
block++;
|
block++;
|
||||||
fprintf(stdout, ".");
|
fprintf(stdout, "."); fflush(stdout);
|
||||||
fflush(stdout);
|
|
||||||
}
|
}
|
||||||
fprintf(stdout, " OK\n");
|
fprintf(stdout, " OK\n");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
|
|
@ -135,7 +135,7 @@ int main(int argc, char **argv) {
|
||||||
fprintf(stdout, "Waiting for Proxmark to appear on %s", serial_port_name);
|
fprintf(stdout, "Waiting for Proxmark to appear on %s", serial_port_name);
|
||||||
do {
|
do {
|
||||||
msleep(500);
|
msleep(500);
|
||||||
fprintf(stderr, ".");
|
fprintf(stderr, "."); fflush(stdout);
|
||||||
} while (!OpenProxmark());
|
} while (!OpenProxmark());
|
||||||
|
|
||||||
fprintf(stdout, " Found.\n");
|
fprintf(stdout, " Found.\n");
|
||||||
|
|
|
@ -336,7 +336,7 @@ static int enter_bootloader(void)
|
||||||
msleep(1000);
|
msleep(1000);
|
||||||
while (!OpenProxmark(0)) {
|
while (!OpenProxmark(0)) {
|
||||||
msleep(1000);
|
msleep(1000);
|
||||||
fprintf(stderr, ".");
|
fprintf(stderr, "."); fflush(stdout);
|
||||||
}
|
}
|
||||||
fprintf(stderr," Found.\n");
|
fprintf(stderr," Found.\n");
|
||||||
|
|
||||||
|
@ -449,7 +449,7 @@ int flash_write(flash_file_t *ctx)
|
||||||
baddr += block_size;
|
baddr += block_size;
|
||||||
length -= block_size;
|
length -= block_size;
|
||||||
block++;
|
block++;
|
||||||
fprintf(stderr, ".");
|
fprintf(stderr, "."); fflush(stdout);
|
||||||
}
|
}
|
||||||
fprintf(stderr, " OK\n");
|
fprintf(stderr, " OK\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ int main(int argc, char **argv)
|
||||||
fprintf(stderr, "Waiting for Proxmark to appear on USB...");
|
fprintf(stderr, "Waiting for Proxmark to appear on USB...");
|
||||||
while (!OpenProxmark(1)) {
|
while (!OpenProxmark(1)) {
|
||||||
msleep(1000);
|
msleep(1000);
|
||||||
fprintf(stderr, ".");
|
fprintf(stderr, "."); fflush(stdout);
|
||||||
}
|
}
|
||||||
fprintf(stderr, " Found.\n");
|
fprintf(stderr, " Found.\n");
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
|
||||||
|
|
||||||
// message
|
// message
|
||||||
PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
|
PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
|
||||||
PrintAndLogEx(SUCCESS, "executing Darkside attack. Expected execution time: 25sec on average\n");
|
PrintAndLogEx(NORMAL, "executing Darkside attack. Expected execution time: 25sec on average");
|
||||||
PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
|
PrintAndLogEx(NORMAL, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.");
|
||||||
PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
|
PrintAndLogEx(NORMAL, "--------------------------------------------------------------------------------\n");
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
|
@ -151,8 +151,7 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
|
||||||
|
|
||||||
while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
|
while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
|
||||||
timeout++;
|
timeout++;
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf("."); fflush(stdout);
|
||||||
fflush(stdout);
|
|
||||||
// max timeout for one chunk of 85keys, 60*3sec = 180seconds
|
// max timeout for one chunk of 85keys, 60*3sec = 180seconds
|
||||||
// s70 with 40*2 keys to check, 80*85 = 6800 auth.
|
// s70 with 40*2 keys to check, 80*85 = 6800 auth.
|
||||||
// takes about 97s, still some margin before abort
|
// takes about 97s, still some margin before abort
|
||||||
|
@ -915,7 +914,7 @@ int detect_classic_nackbug(bool verbose){
|
||||||
while (true) {
|
while (true) {
|
||||||
|
|
||||||
if (term) {
|
if (term) {
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf(".");
|
||||||
} else {
|
} else {
|
||||||
printf(
|
printf(
|
||||||
#if defined(__linux__) || (__APPLE__)
|
#if defined(__linux__) || (__APPLE__)
|
||||||
|
|
|
@ -483,8 +483,7 @@ int main(int argc, char* argv[]) {
|
||||||
do {
|
do {
|
||||||
sp = uart_open(argv[1]);
|
sp = uart_open(argv[1]);
|
||||||
msleep(500);
|
msleep(500);
|
||||||
PrintAndLogEx(NORMAL, ".");
|
printf("."); fflush(stdout);
|
||||||
fflush(stdout);
|
|
||||||
} while (++openCount < 30 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
|
} while (++openCount < 30 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
|
||||||
PrintAndLogEx(NORMAL, "\n");
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue