From: pwpiwi Date: Thu, 28 Dec 2017 17:23:41 +0000 (+0100) Subject: Merge branch 'master' into fix_printf X-Git-Tag: v3.1.0~93^2 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/96be871374e6859af4c0a4b8de32d4824d4c09ec?hp=-c Merge branch 'master' into fix_printf --- 96be871374e6859af4c0a4b8de32d4824d4c09ec diff --combined client/cmdhf14a.c index 856d37b3,e4b245c3..480923d6 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@@ -35,13 -35,8 +35,13 @@@ static int CmdHelp(const char *Cmd); static int waitCmd(uint8_t iLen); +// structure and database for uid -> tagtype lookups +typedef struct { + uint8_t uid; + char* desc; +} manufactureName; -const manufactureName manufactureMapping[] = { +static const manufactureName manufactureMapping[] = { // ID, "Vendor Country" { 0x01, "Motorola UK" }, { 0x02, "ST Microelectronics SA France" }, @@@ -159,7 -154,7 +159,7 @@@ int CmdHF14AReader(const char *Cmd) break; case 'x': case 'X': - cm = cm - ISO14A_CONNECT; + cm &= ~ISO14A_CONNECT; break; default: PrintAndLog("Unknown command."); @@@ -197,7 -192,7 +197,7 @@@ 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)); } @@@ -249,7 -244,7 +249,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) { @@@ -770,7 -765,7 +770,7 @@@ int CmdHF14AAPDU(const char *cmd) return 1; } - if (isxdigit(c)) { + if (isxdigit((unsigned char)c)) { // len = data + PCB(1b) + CRC(2b) switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) { case 1: