REM: Removed the GetVendorStr, and used the getTagInfo() instead.

diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index c3cdde2c944e7b4f2baabc35f01f49765552fac3..f72cfecdb14571fd9de668f6202635477d7e8f15 100644 (file)
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -24,6 +24,8 @@
 #include "cmdparser.h"
 #include "util.h"
 #include "cmdhfmfdes.h"
 #include "cmdparser.h"
 #include "util.h"
 #include "cmdhfmfdes.h"

+#include "cmdhf14a.h"
+

 
 uint8_t CMDPOS = 0;
 uint8_t LENPOS = 1;
 
 uint8_t CMDPOS = 0;
 uint8_t LENPOS = 1;


@@ -158,7 +160,7 @@ int CmdHF14ADesInfo(const char *Cmd){
        PrintAndLog("  Production date    : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
        PrintAndLog("  -----------------------------------------------------------");
        PrintAndLog("  Hardware Information");
        PrintAndLog("  Production date    : week %02x, 20%02x",resp.d.asBytes[33], resp.d.asBytes[34]);
        PrintAndLog("  -----------------------------------------------------------");
        PrintAndLog("  Hardware Information");

-       PrintAndLog("      Vendor Id      : %s", GetVendorStr(resp.d.asBytes[7]));
+       PrintAndLog("      Vendor Id      : %s", getTagInfo(resp.d.asBytes[7]));

        PrintAndLog("      Type           : 0x%02X",resp.d.asBytes[8]);
        PrintAndLog("      Subtype        : 0x%02X",resp.d.asBytes[9]);
        PrintAndLog("      Version        : %d.%d",resp.d.asBytes[10], resp.d.asBytes[11]);
        PrintAndLog("      Type           : 0x%02X",resp.d.asBytes[8]);
        PrintAndLog("      Subtype        : 0x%02X",resp.d.asBytes[9]);
        PrintAndLog("      Version        : %d.%d",resp.d.asBytes[10], resp.d.asBytes[11]);


@@ -166,7 +168,7 @@ int CmdHF14ADesInfo(const char *Cmd){
        PrintAndLog("      Protocol       : %s",GetProtocolStr(resp.d.asBytes[13]));
        PrintAndLog("  -----------------------------------------------------------");
        PrintAndLog("  Software Information");
        PrintAndLog("      Protocol       : %s",GetProtocolStr(resp.d.asBytes[13]));
        PrintAndLog("  -----------------------------------------------------------");
        PrintAndLog("  Software Information");

-       PrintAndLog("      Vendor Id      : %s",GetVendorStr(resp.d.asBytes[14]));
+       PrintAndLog("      Vendor Id      : %s", getTagInfo(resp.d.asBytes[14]));

        PrintAndLog("      Type           : 0x%02X",resp.d.asBytes[15]);
        PrintAndLog("      Subtype        : 0x%02X",resp.d.asBytes[16]);
        PrintAndLog("      Version        : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);
        PrintAndLog("      Type           : 0x%02X",resp.d.asBytes[15]);
        PrintAndLog("      Subtype        : 0x%02X",resp.d.asBytes[16]);
        PrintAndLog("      Version        : %d.%d",resp.d.asBytes[17], resp.d.asBytes[18]);


@@ -211,17 +213,6 @@ int CmdHF14ADesInfo(const char *Cmd){
     return 1;
 }
 
     return 1;
 }
 

-char * GetVendorStr( uint8_t id){
-       static char buf[30];
-       char *retStr = buf;
-       
-       if ( id == 0x04 )
-               sprintf(retStr, "0x%02X (NXP)",id);
-       else 
-               sprintf(retStr,"0x%02X (Unknown)",id);
-       return buf;
-}
-

 /*
   The 7 MSBits (= n) code the storage size itself based on 2^n, 
   the LSBit is set to '0' if the size is exactly 2^n
 /*
   The 7 MSBits (= n) code the storage size itself based on 2^n, 
   the LSBit is set to '0' if the size is exactly 2^n

diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 6ebc98ae984ce6299b20f4c07d17cf00d225fe82..c05f15d609c5e2252c6c9143846592b49bed65f3 100644 (file)
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -16,7 +16,6 @@ int CmdHF14ADesInfo(const char *Cmd);
 int CmdHF14ADesEnumApplications(const char *Cmd);
 
 char * GetCardSizeStr( uint8_t fsize );
 int CmdHF14ADesEnumApplications(const char *Cmd);
 
 char * GetCardSizeStr( uint8_t fsize );

-char * GetVendorStr( uint8_t id);

 char * GetProtocolStr(uint8_t id);
 void GetKeySettings( uint8_t * aid);
 
 char * GetProtocolStr(uint8_t id);
 void GetKeySettings( uint8_t * aid);