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

less printf

Browse source
This commit is contained in:
iceman1001 2020-11-13 16:08:48 +01:00
commit 1b697d2e42
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/src/cmdlfem4x05.c
View file

@ -1882,7 +1882,8 @@ uint32_t static em4x05_Sniff_GetBlock(char *bits, bool fwd) {
if (parity != (bits[35] - '0')) if (parity != (bits[35] - '0'))
parityerror = true; parityerror = true;
if (parityerror) printf("parity error : "); if (parityerror)
PrintAndLogEx(ERR, "parity error : ");
if (!fwd) { if (!fwd) {
uint32_t t1 = value; uint32_t t1 = value;
@ -1997,10 +1998,10 @@ int CmdEM4x05Sniff(const char *Cmd) {
((strncmp(bits, "01010", 5) == 0) && (bitidx == 50))) { ((strncmp(bits, "01010", 5) == 0) && (bitidx == 50))) {
memmove(bits, &bits[1], bitidx - 1); memmove(bits, &bits[1], bitidx - 1);
bitidx--; bitidx--;
printf("Trim leading 0\n"); PrintAndLogEx(INFO, "Trim leading 0");
} }
bits[bitidx] = 0; bits[bitidx] = 0;
// printf ("==> %s\n",bits);
// logon // logon
if ((strncmp(bits, "0011", 4) == 0) && (bitidx == 49)) { if ((strncmp(bits, "0011", 4) == 0) && (bitidx == 49)) {
haveData = true; haveData = true;
@ -2017,8 +2018,9 @@ int CmdEM4x05Sniff(const char *Cmd) {
sprintf(cmdText, "Write"); sprintf(cmdText, "Write");
tmpValue = (bits[4] - '0') + ((bits[5] - '0') << 1) + ((bits[6] - '0') << 2) + ((bits[7] - '0') << 3); tmpValue = (bits[4] - '0') + ((bits[5] - '0') << 1) + ((bits[6] - '0') << 2) + ((bits[7] - '0') << 3);
sprintf(blkAddr, "%d", tmpValue); sprintf(blkAddr, "%d", tmpValue);
if (tmpValue == 2) if (tmpValue == 2) {
pwd = true; pwd = true;
}
tmpValue = em4x05_Sniff_GetBlock(&bits[11], fwd); tmpValue = em4x05_Sniff_GetBlock(&bits[11], fwd);
sprintf(dataText, "%08X", tmpValue); sprintf(dataText, "%08X", tmpValue);
} }
@ -2057,26 +2059,26 @@ int CmdEM4x05Sniff(const char *Cmd) {
} else { } else {
i = (CycleWidth - ZeroWidth) / 28; i = (CycleWidth - ZeroWidth) / 28;
bits[bitidx++] = '0'; bits[bitidx++] = '0';
for (int ii = 0; ii < i; ii++) for (int ii = 0; ii < i; ii++) {
bits[bitidx++] = '1'; bits[bitidx++] = '1';
} }
} }
} }
} }
}
idx++; idx++;
// Print results // Print results
if (haveData) { //&& (minWidth > 1) && (maxWidth > minWidth)){ if (haveData) { //&& (minWidth > 1) && (maxWidth > minWidth)){
if (pwd) if (pwd)
PrintAndLogEx(SUCCESS, "%6zu | %-10s | "_YELLOW_("%8s")" | "_YELLOW_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits); PrintAndLogEx(SUCCESS, "%6zu | %-10s | " _YELLOW_("%8s")" | " _YELLOW_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits);
else else
PrintAndLogEx(SUCCESS, "%6zu | %-10s | "_GREEN_("%8s")" | "_GREEN_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits); PrintAndLogEx(SUCCESS, "%6zu | %-10s | " _GREEN_("%8s")" | " _GREEN_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits);
} }
} }
// footer // footer
PrintAndLogEx(SUCCESS, "---------------------------------------------------------------------------------------------------"); PrintAndLogEx(SUCCESS, "---------------------------------------------------------------------------------------------------");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;
} }