X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/eba61a5647762ee184535172db1db11137688ed8..254b70a4afb07e6ec0f8b1b300df488337bbebc3:/client/cmdhf15.c?ds=sidebyside
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 851af8a8..a13ac4d0 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
-// Modified 2010 by <adrian -at- atrox.at>
+// Modified 2010-2012 by <adrian -at- atrox.at>
+// Modified 2012 by <vsza at vsza.hu>
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
@@ -54,6 +55,7 @@ typedef struct {
const productName uidmapping[] = {
+ // UID, #significant Bits, "Vendor(+Product)"
{ 0xE001000000000000LL, 16, "Motorola" },
{ 0xE002000000000000LL, 16, "ST Microelectronics" },
{ 0xE003000000000000LL, 16, "Hitachi" },
@@ -65,6 +67,7 @@ const productName uidmapping[] = {
{ 0xE007000000000000LL, 16, "Texas Instrument; " },
{ 0xE007000000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Inlay; 64x32bit" },
{ 0xE007100000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Chip; 64x32bit" },
+ { 0xE007800000000000LL, 23, "Texas Instrument; Tag-it HF-I Plus (RF-HDT-DVBB tag or Third Party Products)" },
{ 0xE007C00000000000LL, 23, "Texas Instrument; Tag-it HF-I Standard; 8x32bit" },
{ 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" },
{ 0xE008000000000000LL, 16, "Fujitsu" },
@@ -78,8 +81,10 @@ const productName uidmapping[] = {
{ 0xE010000000000000LL, 16, "LG-Semiconductors" },
{ 0xE012000000000000LL, 16, "HID Corporation" },
{ 0xE016000000000000LL, 16, "EM-Marin SA (Skidata)" },
- { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); no memory" },
+ { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034? no 'read', just 'readmulti'" },
+ { 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" },
{ 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" },
+ { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" },
{ 0,0,"no tag-info available" } // must be the last entry
};
@@ -532,6 +537,11 @@ int CmdHF15CmdRaw (const char *cmd) {
}
+/**
+ * parses common HF 15 CMD parameters and prepares some data structures
+ * Parameters:
+ * **cmd command line
+ */
int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
int temp;
uint8_t *req=c->d.asBytes, uid[8];
@@ -578,6 +588,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
reqlen+=iso15cmdlen;
break;
case '*':
+ // we scan for the UID ourself
req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
@@ -619,8 +630,6 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
return 1;
}
-
-
/**
* Commandline handling: HF15 CMD SYSINFO
* get system information from tag/VICC
@@ -640,7 +649,7 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
// usage:
if (strlen(cmd)<1) {
- PrintAndLog("Usage: hf 15 cmd sysinfo [options] <uid|s|*>");
+ PrintAndLog("Usage: hf 15 cmd sysinfo [options] <uid|s|u|*>");
PrintAndLog(" options:");
PrintAndLog(" -2 use slower '1 out of 256' mode");
PrintAndLog(" uid (either): ");
@@ -711,8 +720,91 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
return 0;
}
+/**
+ * Commandline handling: HF15 CMD READMULTI
+ * Read multiple blocks at once (not all tags support this)
+ */
+int CmdHF15CmdReadmulti(const char *Cmd) {
+ UsbCommand *r;
+ uint8_t *recv;
+ UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+ uint8_t *req=c.d.asBytes;
+ int reqlen=0, pagenum,pagecount;
+ char cmdbuf[100];
+ char *cmd=cmdbuf;
+ char output[2048]="";
+
+ strncpy(cmd,Cmd,99);
+
+ // usage:
+ if (strlen(cmd)<3) {
+ PrintAndLog("Usage: hf 15 cmd readmulti [options] <uid|s|u|*> <start#> <count#>");
+ PrintAndLog(" options:");
+ PrintAndLog(" -2 use slower '1 out of 256' mode");
+ PrintAndLog(" uid (either): ");
+ PrintAndLog(" <8B hex> full UID eg E011223344556677");
+ PrintAndLog(" s selected tag");
+ PrintAndLog(" u unaddressed mode");
+ PrintAndLog(" * scan for tag");
+ PrintAndLog(" start#: page number to start 0-255");
+ PrintAndLog(" count#: number of pages");
+ return 0;
+ }
+
+ prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_READMULTI},1);
+ reqlen=c.arg[0];
+
+ pagenum=strtol(cmd,NULL,0);
+
+ // skip to next space
+ while (*cmd!=' ' && *cmd!='\t') cmd++;
+ // skip over the space
+ while (*cmd==' ' || *cmd=='\t') cmd++;
+
+ pagecount=strtol(cmd,NULL,0);
+ if (pagecount>0) pagecount--; // 0 means 1 page, 1 means 2 pages, ...
+
+ req[reqlen++]=(uint8_t)pagenum;
+ req[reqlen++]=(uint8_t)pagecount;
+
+ reqlen=AddCrc(req,reqlen);
+
+ c.arg[0]=reqlen;
+
+ SendCommand(&c);
+ r=WaitForResponseTimeout(CMD_ACK,1000);
+
+ if (r!=NULL && r->arg[0]>2) {
+ recv = r->d.asBytes;
+ if (ISO15_CRC_CHECK==Crc(recv,r->arg[0])) {
+ if (!(recv[0] & ISO15_RES_ERROR)) {
+ *output=0; // reset outputstring
+ for ( int i=1; i<r->arg[0]-2; i++) {
+ sprintf(output+strlen(output),"%02hX ",recv[i]);
+ }
+ strcat(output," ");
+ for ( int i=1; i<r->arg[0]-2; i++) {
+ sprintf(output+strlen(output),"%c",recv[i]>31 && recv[i]<127?recv[i]:'.');
+ }
+ PrintAndLog("%s",output);
+ } else {
+ PrintAndLog("Tag returned Error %i: %s",recv[0],TagErrorStr(recv[0]));
+ }
+ } else {
+ PrintAndLog("CRC failed");
+ }
+ } else {
+ PrintAndLog("no answer");
+ }
+
+ return 0;
+}
+/**
+ * Commandline handling: HF15 CMD READ
+ * Reads a single Block
+ */
int CmdHF15CmdRead(const char *Cmd) {
UsbCommand *r;
uint8_t *recv;
@@ -727,7 +819,7 @@ int CmdHF15CmdRead(const char *Cmd) {
// usage:
if (strlen(cmd)<3) {
- PrintAndLog("Usage: hf 15 cmd read [options] <uid|s|*> <page#>");
+ PrintAndLog("Usage: hf 15 cmd read [options] <uid|s|u|*> <page#>");
PrintAndLog(" options:");
PrintAndLog(" -2 use slower '1 out of 256' mode");
PrintAndLog(" uid (either): ");
@@ -786,6 +878,10 @@ int CmdHF15CmdRead(const char *Cmd) {
}
+/**
+ * Commandline handling: HF15 CMD WRITE
+ * Writes a single Block - might run into timeout, even when successful
+ */
int CmdHF15CmdWrite(const char *Cmd) {
UsbCommand *r;
uint8_t *recv;
@@ -800,7 +896,7 @@ int CmdHF15CmdWrite(const char *Cmd) {
// usage:
if (strlen(cmd)<3) {
- PrintAndLog("Usage: hf 15 cmd write [options] <uid|s|*> <page#> <hexdata>");
+ PrintAndLog("Usage: hf 15 cmd write [options] <uid|s|u|*> <page#> <hexdata>");
PrintAndLog(" options:");
PrintAndLog(" -2 use slower '1 out of 256' mode");
PrintAndLog(" -o set OPTION Flag (needed for TI)");
@@ -861,7 +957,7 @@ int CmdHF15CmdWrite(const char *Cmd) {
PrintAndLog("CRC failed");
}
} else {
- PrintAndLog("no answer");
+ PrintAndLog("timeout: no answer - data may be written anyway");
}
return 0;
@@ -878,10 +974,8 @@ static command_t CommandTable15Cmd[] =
*/
{"read", CmdHF15CmdRead, 0, "Read a block"},
{"write", CmdHF15CmdWrite, 0, "Write a block"},
-/*
{"readmulti",CmdHF15CmdReadmulti, 0, "Reads multiple Blocks"},
-*/
- {"sysinfo", CmdHF15CmdSysinfo, 0, "Get Card Information"},
+ {"sysinfo",CmdHF15CmdSysinfo, 0, "Get Card Information"},
{"raw", CmdHF15CmdRaw, 0, "Send raw hex data to tag"},
{"debug", CmdHF15CmdDebug, 0, "Turn debugging on/off"},
{NULL, NULL, 0, NULL}