#include "util.h"
#include "cmdparser.h"
#include "cmdhf15.h"
-#include "../common/iso15693tools.h"
+#include "iso15693tools.h"
#include "cmdmain.h"
-#define FrameSOF Iso15693FrameSOF
-#define Logic0 Iso15693Logic0
-#define Logic1 Iso15693Logic1
-#define FrameEOF Iso15693FrameEOF
+#define FrameSOF Iso15693FrameSOF
+#define Logic0 Iso15693Logic0
+#define Logic1 Iso15693Logic1
+#define FrameEOF Iso15693FrameEOF
-#define Crc(data,datalen) Iso15693Crc(data,datalen)
-#define AddCrc(data,datalen) Iso15693AddCrc(data,datalen)
+#define Crc(data,datalen) Iso15693Crc(data,datalen)
+#define AddCrc(data,datalen) Iso15693AddCrc(data,datalen)
#define sprintUID(target,uid) Iso15693sprintUID(target,uid)
-#define TRACE_BUFF_SIZE 12000
// structure and database for uid -> tagtype lookups
typedef struct {
{ 0xE014000000000000LL, 16, "SHARP Corporation Japan" },
{ 0xE015000000000000LL, 16, "ATMEL France" },
- { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)" },
- { 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" },
-
+ { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"},
+ { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"},
+ { 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"},
+ { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"},
+ { 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"},
+ { 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"},
+ { 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"},
+ { 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"},
+ { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"},
+ { 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" },
+ { 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"},
+ { 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"},
+ { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF 51x64bit "},
+ { 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" },
+ { 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" },
+ { 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" },
+
{ 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
{ 0xE018000000000000LL, 16, "ZMD AG Germany" },
{ 0xE019000000000000LL, 16, "XICOR, Inc. USA" },
{ 0xE02E000000000000LL, 16, "Broadcom Corporation USA" },
{ 0xE02F000000000000LL, 16, "MStar Semiconductor, Inc Taiwan, ROC" },
{ 0xE030000000000000LL, 16, "BeeDar Technology Inc. USA" },
- { 0xE031000000000000LL, 16, " RFIDsec Denmark" },
- { 0xE032000000000000LL, 16, " Schweizer Electronic AG Germany" },
- { 0xE033000000000000LL, 16, " AMIC Technology Corp Taiwan" },
+ { 0xE031000000000000LL, 16, "RFIDsec Denmark" },
+ { 0xE032000000000000LL, 16, "Schweizer Electronic AG Germany" },
+ { 0xE033000000000000LL, 16, "AMIC Technology Corp Taiwan" },
{ 0xE034000000000000LL, 16, "Mikron JSC Russia" },
{ 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" },
{ 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" },
if (best==-1) {
best=i;
} else {
- if (uidmapping[i].mask > uidmapping[best].mask) {
+ if (uidmapping[i].mask>uidmapping[best].mask) {
best=i;
}
}
// First, correlate for SOF
for (i = 0; i < 100; i++) {
int corr = 0;
- for (j = 0; j < arraylen(FrameSOF); j += skip) {
+ for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
}
if (corr > max) {
maxPos = i;
}
}
- PrintAndLog("SOF at %d, correlation %d", maxPos,
- max / (arraylen(FrameSOF) / skip));
+ PrintAndLog("SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
- i = maxPos + arraylen(FrameSOF) / skip;
+ i = maxPos + ARRAYLEN(FrameSOF) / skip;
int k = 0;
uint8_t outBuf[20];
memset(outBuf, 0, sizeof(outBuf));
uint8_t mask = 0x01;
for (;;) {
int corr0 = 0, corr1 = 0, corrEOF = 0;
- for (j = 0; j < arraylen(Logic0); j += skip) {
+ for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
}
- for (j = 0; j < arraylen(Logic1); j += skip) {
+ for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
}
- for (j = 0; j < arraylen(FrameEOF); j += skip) {
+ for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
}
// Even things out by the length of the target waveform.
PrintAndLog("EOF at %d", i);
break;
} else if (corr1 > corr0) {
- i += arraylen(Logic1) / skip;
+ i += ARRAYLEN(Logic1) / skip;
outBuf[k] |= mask;
} else {
- i += arraylen(Logic0) / skip;
+ i += ARRAYLEN(Logic0) / skip;
}
mask <<= 1;
if (mask == 0) {
k++;
mask = 0x01;
}
- if ((i + (int)arraylen(FrameEOF)) >= GraphTraceLen) {
+ if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
PrintAndLog("ran off end!");
break;
}
return 0;
}
+int HF15Reader(const char *Cmd, bool verbose)
+{
+ uint8_t uid[8];
+
+ if (!getUID(uid)) {
+ if (verbose) PrintAndLog("No Tag found.");
+ return 0;
+ }
+
+ PrintAndLog("Tag UID : %s",sprintUID(NULL,uid));
+ PrintAndLog("Tag Info: %s",getTagInfo(uid));
+ return 1;
+}
+
int CmdHF15Reader(const char *Cmd)
{
UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
// Reads all memory pages
int CmdHF15DumpMem(const char*Cmd) {
+
+ uint8_t uid[8] = {0,0,0,0,0,0,0,0};
+ uint8_t *recv = NULL;
UsbCommand resp;
- uint8_t uid[8];
- uint8_t *recv=NULL;
UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
- uint8_t *req=c.d.asBytes;
- int reqlen=0;
- int blocknum=0;
- char output[80];
+ uint8_t *req = c.d.asBytes;
+ int reqlen = 0, blocknum = 0;
+ char output[80] = {0};
if (!getUID(uid)) {
PrintAndLog("No Tag found.");
recv = resp.d.asBytes;
if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
if (!(recv[0] & ISO15_RES_ERROR)) {
- retry=0;
- *output=0; // reset outputstring
+ retry = 0;
+ *output = 0; // reset outputstring
sprintf(output, "Block %02x ",blocknum);
for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
sprintf(output+strlen(output),"%02X ",recv[i]);
}
strcat(output," ");
- for ( int i=1; i<resp.arg[0]-2; i++) { // data in cleaned ascii
- sprintf(output+strlen(output),"%c",(recv[i]>31 && recv[i]<127)?recv[i]:'.');
+ for ( int i = 1; i < resp.arg[0]-2; i++) { // data in cleaned ascii
+ sprintf(output+strlen(output),"%c",(recv[i] > 31 && recv[i] < 127) ? recv[i] : '.');
}
PrintAndLog("%s",output);
blocknum++;
// PrintAndLog("bn=%i",blocknum);
} else {
PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1]));
- return 0;
+ return 1;
}
} // else PrintAndLog("crc");
} // else PrintAndLog("r null");
// PrintAndLog("CRC Failed");
// else
// PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1]));
- return 0;
+ return 1;
}
{"cmd", CmdHF15Cmd, 0, "Send direct commands to ISO15693 tag"},
{"findafi", CmdHF15Afi, 0, "Brute force AFI of an ISO15693 tag"},
{"dumpmemory", CmdHF15DumpMem, 0, "Read all memory pages of an ISO15693 tag"},
- {NULL, NULL, 0, NULL}
+ {NULL, NULL, 0, NULL}
};
int CmdHF15(const char *Cmd)
UsbCommand resp;
uint8_t *recv;
UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
- uint8_t *req=c.d.asBytes;
- int reqlen=0;
+ uint8_t *req = c.d.asBytes;
+ int reqlen = 0;
char cmdbuf[100];
- char *cmd=cmdbuf;
+ char *cmd = cmdbuf;
char output[2048]="";
int i;
}
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1);
- reqlen=c.arg[0];
+ reqlen = c.arg[0];
reqlen=AddCrc(req,reqlen);
c.arg[0]=reqlen;
projects / proxmark3-svn / blobdiff