X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/fb2d24882e31c4a9915a87e28081c3f7d6f3bea4..833081e3e79cf86a7ebae94e3037ef04756d44fd:/client/cmdhfmfdes.c

diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index c3cdde2c..f72cfecd 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -24,6 +24,8 @@
 #include "cmdparser.h"
 #include "util.h"
 #include "cmdhfmfdes.h"
+#include "cmdhf14a.h"
+
 
 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("      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]);
@@ -166,7 +168,7 @@ int CmdHF14ADesInfo(const char *Cmd){
 	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]);
@@ -211,17 +213,6 @@ int CmdHF14ADesInfo(const char *Cmd){
     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