fix: part of @pwpiwi 's #534 fixes

This commit is contained in:
iceman1001 2018-01-01 18:57:37 +01:00
parent d9089e74b4
commit c328f68640

View file

@ -15,7 +15,7 @@
static int CmdHelp(const char *Cmd);
static int waitCmd(uint8_t iLen);
const manufactureName manufactureMapping[] = {
static const manufactureName manufactureMapping[] = {
// ID, "Vendor Country"
{ 0x01, "Motorola UK" },
{ 0x02, "ST Microelectronics SA France" },
@ -201,7 +201,7 @@ int CmdHF14AReader(const char *Cmd) {
break;
case 'x':
case 'X':
cm = cm - ISO14A_CONNECT;
cm &= ~ISO14A_CONNECT;
break;
default:
PrintAndLog("Unknown command.");
@ -253,7 +253,7 @@ int CmdHF14AReader(const char *Cmd) {
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
@ -313,7 +313,7 @@ int CmdHF14AInfo(const char *Cmd) {
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
PrintAndLog(" SAK : %02x [%" PRIu64 "]", card.sak, resp.arg[0]);
bool isMifareClassic = true;
switch (card.sak) {