github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up unprintable characters in MFU dump output

Browse source
This commit is contained in:
James Chambers 2017-03-03 17:38:51 -05:00
parent f76d6fae10
commit 4bbf5ad17d
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhfmfu.c
View file

@ -7,6 +7,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// High frequency MIFARE ULTRALIGHT (C) commands // High frequency MIFARE ULTRALIGHT (C) commands
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <ctype.h>
#include "loclass/des.h" #include "loclass/des.h"
#include "cmdhfmfu.h" #include "cmdhfmfu.h"
#include "cmdhfmf.h" #include "cmdhfmf.h"
@ -1230,6 +1231,7 @@ int CmdHF14AMfUDump(const char *Cmd){
bool manualPages = false; bool manualPages = false;
uint8_t startPage = 0; uint8_t startPage = 0;
char tempStr[50]; char tempStr[50];
char cleanASCII[4];
while(param_getchar(Cmd, cmdp) != 0x00) while(param_getchar(Cmd, cmdp) != 0x00)
{ {
@ -1372,7 +1374,7 @@ int CmdHF14AMfUDump(const char *Cmd){
PrintAndLog("---------------------------------"); PrintAndLog("---------------------------------");
for (i = 0; i < Pages; ++i) { for (i = 0; i < Pages; ++i) {
if ( i < 3 ) { if ( i < 3 ) {
PrintAndLog("%02d/0x%02X | %s| | ", i+startPage, i+startPage, sprint_hex(data + i * 4, 4)); PrintAndLog("%3d/0x%02X | %s| | ", i+startPage, i+startPage, sprint_hex(data + i * 4, 4));
continue; continue;
} }
switch(i){ switch(i){
@ -1419,7 +1421,17 @@ int CmdHF14AMfUDump(const char *Cmd){
case 43: tmplockbit = bit2[9]; break; //auth1 case 43: tmplockbit = bit2[9]; break; //auth1
default: break; default: break;
} }
PrintAndLog("%02d/0x%02X | %s| %d | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
// convert unprintable characters and line breaks to dots
memcpy(cleanASCII, data+i*4, 4);
for (size_t clean_i = 0; clean_i < 4; clean_i++) {
if (!isprint(cleanASCII[clean_i])) {
cleanASCII[clean_i] = '.';
}
}
PrintAndLog("%3d/0x%02X | %s| %d | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), tmplockbit, cleanASCII);
} }
PrintAndLog("---------------------------------"); PrintAndLog("---------------------------------");