X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4bbf5ad17d6e75362f19ce93c99680ddf081ab66..bea6e7b0b648868926329addf21036255a460166:/client/cmdhfmfu.c?ds=sidebyside diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index 9c5f7a83..ed8c588d 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -7,9 +7,16 @@ //----------------------------------------------------------------------------- // High frequency MIFARE ULTRALIGHT (C) commands //----------------------------------------------------------------------------- -#include -#include "loclass/des.h" + #include "cmdhfmfu.h" + +#include +#include +#include "proxmark3.h" +#include "usb_cmd.h" +#include "cmdmain.h" +#include "ui.h" +#include "loclass/des.h" #include "cmdhfmf.h" #include "cmdhf14a.h" #include "mifare.h" @@ -1231,7 +1238,7 @@ int CmdHF14AMfUDump(const char *Cmd){ bool manualPages = false; uint8_t startPage = 0; char tempStr[50]; - char cleanASCII[4]; + unsigned char cleanASCII[4]; while(param_getchar(Cmd, cmdp) != 0x00) { @@ -1424,12 +1431,7 @@ int CmdHF14AMfUDump(const char *Cmd){ // 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] = '.'; - } - } + clean_ascii(cleanASCII, 4); PrintAndLog("%3d/0x%02X | %s| %d | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), tmplockbit, cleanASCII); }