github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

no printf

Browse source
This commit is contained in:
iceman1001 2020-08-29 15:22:26 +02:00
commit 11052fabf7
1 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/src/cmdhficlass.c
View file

@ -962,11 +962,10 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
SendCommandNG(CMD_HF_ICLASS_REPLAY, (uint8_t *)&payload, sizeof(payload)); SendCommandNG(CMD_HF_ICLASS_REPLAY, (uint8_t *)&payload, sizeof(payload));
while (true) { while (true) {
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (kbd_enter_pressed()) { if (kbd_enter_pressed()) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
PrintAndLogEx(WARNING, "aborted via keyboard!\n");
DropField(); DropField();
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
@ -975,6 +974,7 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
break; break;
} }
PrintAndLogEx(NORMAL, "");
if (resp.status != PM3_SUCCESS) { if (resp.status != PM3_SUCCESS) {
PrintAndLogEx(ERR, "failed to communicate with card"); PrintAndLogEx(ERR, "failed to communicate with card");
return resp.status; return resp.status;
@ -1189,7 +1189,7 @@ static int CmdHFiClassESave(const char *Cmd) {
// user supplied filename? // user supplied filename?
if (len < 1) { if (len < 1) {
fnameptr += sprintf(fnameptr, "hf-iclass-"); fnameptr += snprintf(fnameptr, sizeof(filename), "hf-iclass-");
FillFileNameByUID(fnameptr, dump, "-dump", 8); FillFileNameByUID(fnameptr, dump, "-dump", 8);
} }
@ -1408,7 +1408,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
uint64_t pin = bytes_to_num(decrypted + (8 * 9), 5); uint64_t pin = bytes_to_num(decrypted + (8 * 9), 5);
char tmp[17] = {0}; char tmp[17] = {0};
sprintf(tmp, "%."PRIu64, BCD2DEC(pin)); snprintf(tmp, sizeof(tmp), "%."PRIu64, BCD2DEC(pin));
PrintAndLogEx(INFO, "PIN........................ " _GREEN_("%.*s"), pinsize, tmp); PrintAndLogEx(INFO, "PIN........................ " _GREEN_("%.*s"), pinsize, tmp);
} }
} }
@ -1756,11 +1756,10 @@ static int CmdHFiClassDump(const char *Cmd) {
SendCommandNG(CMD_HF_ICLASS_DUMP, (uint8_t *)&payload, sizeof(payload)); SendCommandNG(CMD_HF_ICLASS_DUMP, (uint8_t *)&payload, sizeof(payload));
while (true) { while (true) {
printf(".");
fflush(stdout); PrintAndLogEx(NORMAL, "." NOLF);
if (kbd_enter_pressed()) { if (kbd_enter_pressed()) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
PrintAndLogEx(WARNING, "aborted via keyboard!\n");
DropField(); DropField();
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
@ -1769,6 +1768,7 @@ static int CmdHFiClassDump(const char *Cmd) {
break; break;
} }
PrintAndLogEx(NORMAL, "");
if (resp.status != PM3_SUCCESS) { if (resp.status != PM3_SUCCESS) {
PrintAndLogEx(ERR, "failed to communicate with card"); PrintAndLogEx(ERR, "failed to communicate with card");
return resp.status; return resp.status;
@ -1828,11 +1828,9 @@ static int CmdHFiClassDump(const char *Cmd) {
SendCommandNG(CMD_HF_ICLASS_DUMP, (uint8_t *)&payload, sizeof(payload)); SendCommandNG(CMD_HF_ICLASS_DUMP, (uint8_t *)&payload, sizeof(payload));
while (true) { while (true) {
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (kbd_enter_pressed()) { if (kbd_enter_pressed()) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(WARNING, "\naborted via keyboard!\n");
PrintAndLogEx(WARNING, "aborted via keyboard!\n");
DropField(); DropField();
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
@ -1840,7 +1838,7 @@ static int CmdHFiClassDump(const char *Cmd) {
if (WaitForResponseTimeout(CMD_HF_ICLASS_DUMP, &resp, 2000)) if (WaitForResponseTimeout(CMD_HF_ICLASS_DUMP, &resp, 2000))
break; break;
} }
PrintAndLogEx(NORMAL, "");
if (resp.status != PM3_SUCCESS) { if (resp.status != PM3_SUCCESS) {
PrintAndLogEx(ERR, "failed to communicate with card"); PrintAndLogEx(ERR, "failed to communicate with card");
goto write_dump; goto write_dump;
@ -2233,8 +2231,8 @@ static int CmdHFiClassRestore(const char *Cmd) {
for (i = 0; i <= endblock - startblock; i++) { for (i = 0; i <= endblock - startblock; i++) {
memcpy(p, data + (i * 12), 12); memcpy(p, data + (i * 12), 12);
char *s = calloc(70, sizeof(uint8_t)); char *s = calloc(70, sizeof(uint8_t));
sprintf(s, "| %s ", sprint_hex(p, 8)); snprintf(s, 70, "| %s ", sprint_hex(p, 8));
sprintf(s + strlen(s), "| %s", sprint_hex(p + 8, 4)); snprintf(s + strlen(s), 70 - strlen(s), "| %s", sprint_hex(p + 8, 4));
PrintAndLogEx(NORMAL, " %02X %s", i + startblock, s); PrintAndLogEx(NORMAL, " %02X %s", i + startblock, s);
free(s); free(s);
} }
@ -3088,11 +3086,9 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
bool looped = false; bool looped = false;
while (!WaitForResponseTimeout(CMD_HF_ICLASS_CHKKEYS, &resp, 2000)) { while (!WaitForResponseTimeout(CMD_HF_ICLASS_CHKKEYS, &resp, 2000)) {
timeout++; timeout++;
printf("."); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout);
if (timeout > 120) { if (timeout > 120) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting...");
PrintAndLogEx(WARNING, "No response from Proxmark3. Aborting...");
goto out; goto out;
} }
looped = true; looped = true;