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

Minor fixes

Browse source 
* fix compiler warnings on Ubuntu
* cmdhf14a.c: make manufactureMapping static
* cmdhf14a.c: fix format strings
This commit is contained in:
pwpiwi 2017-12-28 08:49:07 +01:00
parent 91e03840f4
commit b838c4ff27
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/cmdhf14a.c
View file

@ -16,6 +16,7 @@
#include <inttypes.h>
#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include "util.h"
#include "util_posix.h"
#include "iso14443crc.h"
@ -34,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" },
@ -153,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.");
@ -191,7 +197,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));
}
@ -243,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) {