Merge pull request #600 from marshmellow42/master

[proxmark3-svn] / client / cmdhf14a.c

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 8064724cc3185a66b2e86f0c38c4bb8baaf9646c..480923d663a91f3de77531b67f2b5ddac4fcb2b9 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -16,6 +16,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>

+#include <ctype.h>

 #include "util.h"
 #include "util_posix.h"
 #include "iso14443crc.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);
 
 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" },
        // 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':
                        break;
                case 'x':
                case 'X':

-                       cm = cm - ISO14A_CONNECT;
+                       cm &= ~ISO14A_CONNECT;

                        break;
                default:
                        PrintAndLog("Unknown command.");
                        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(" 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));
                }
                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(" 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) {
 
        bool isMifareClassic = true;
        switch (card.sak) {


@@ -764,7 +770,7 @@ int CmdHF14AAPDU(const char *cmd) {
                                        return 1;
                        }
                        
                                        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:
                        // len = data + PCB(1b) + CRC(2b)
                        switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
                        case 1: