#include <stdlib.h>
#include <string.h>
#include "data.h"
-#include "proxusb.h"
+#include "proxmark3.h"
#include "ui.h"
#include "cmdparser.h"
-#include "common.h"
+#include "../include/common.h"
#include "util.h"
-#include "hitag2.h"
+#include "../include/hitag2.h"
+#include "sleep.h"
+#include "cmdmain.h"
static int CmdHelp(const char *Cmd);
+size_t nbytes(size_t nbits) {
+ return (nbits/8)+((nbits%8)>0);
+}
+
int CmdLFHitagList(const char *Cmd)
{
- uint8_t got[3000];
+ uint8_t got[TRACE_BUFFER_SIZE];
GetFromBigBuf(got,sizeof(got),0);
- char filename[256];
- FILE* pf;
-
- param_getstr(Cmd,0,filename);
-
- if (strlen(filename) > 0) {
- if ((pf = fopen(filename,"w")) == NULL) {
- PrintAndLog("Error: Could not open file [%s]",filename);
- return 1;
- }
- }
+ WaitForResponse(CMD_ACK,NULL);
PrintAndLog("recorded activity:");
- PrintAndLog(" ETU :rssi: who bytes");
- PrintAndLog("---------+----+----+-----------");
+ PrintAndLog(" ETU :nbits: who bytes");
+ PrintAndLog("---------+-----+----+-----------");
int i = 0;
int prev = -1;
+ int len = strlen(Cmd);
+ char filename[FILE_PATH_SIZE] = { 0x00 };
+ FILE* pf = NULL;
+
+ if (len > FILE_PATH_SIZE)
+ len = FILE_PATH_SIZE;
+ memcpy(filename, Cmd, len);
+
+ if (strlen(filename) > 0) {
+ if ((pf = fopen(filename,"wb")) == NULL) {
+ PrintAndLog("Error: Could not open file [%s]",filename);
+ return 1;
+ }
+ }
+
for (;;) {
- if(i >= 1900) {
- break;
- }
+
+ if(i >= TRACE_BUFFER_SIZE) { break; }
bool isResponse;
int timestamp = *((uint32_t *)(got+i));
isResponse = 0;
}
- int metric = 0;
int parityBits = *((uint32_t *)(got+i+4));
// 4 bytes of additional information...
// maximum of 32 additional parity bit information
// at each quarter bit period we can send power level (16 levels)
// or each half bit period in 256 levels.
- int len = got[i+8];
+ int bits = got[i+8];
+ int len = nbytes(got[i+8]);
if (len > 100) {
break;
}
- if (i + len >= 1900) {
- break;
- }
+ if (i + len >= TRACE_BUFFER_SIZE) { break;}
uint8_t *frame = (got+i+9);
}
}
- char metricString[100];
- if (isResponse) {
- sprintf(metricString, "%3d", metric);
- } else {
- strcpy(metricString, " ");
- }
-
- PrintAndLog(" +%7d: %s: %s %s",
+ PrintAndLog(" +%7d: %3d: %s %s",
(prev < 0 ? 0 : (timestamp - prev)),
- metricString,
+ bits,
(isResponse ? "TAG" : " "),
line);
- if (strlen(filename) > 0) {
- fprintf(pf," +%7d: %s: %s %s %s",
+ if (pf) {
+ fprintf(pf," +%7d: %3d: %s %s\n",
(prev < 0 ? 0 : (timestamp - prev)),
- metricString,
+ bits,
(isResponse ? "TAG" : " "),
- line,
- "\n");
+ line);
}
prev = timestamp;
i += (len + 9);
}
- if (strlen(filename) > 0) {
- PrintAndLog("Recorded activity succesfully written to file: %s", filename);
+ if (pf) {
fclose(pf);
+ PrintAndLog("Recorded activity succesfully written to file: %s", filename);
}
return 0;
}
int CmdLFHitagSim(const char *Cmd) {
- UsbCommand c = {CMD_SIMULATE_HITAG};
- char filename[256] = { 0x00 };
+
+ UsbCommand c = {CMD_SIMULATE_HITAG};
+ char filename[FILE_PATH_SIZE] = { 0x00 };
FILE* pf;
bool tag_mem_supplied;
-
- param_getstr(Cmd,0,filename);
-
+ int len = strlen(Cmd);
+ if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+ memcpy(filename, Cmd, len);
+
if (strlen(filename) > 0) {
if ((pf = fopen(filename,"rb+")) == NULL) {
PrintAndLog("Error: Could not open file [%s]",filename);
return 1;
}
tag_mem_supplied = true;
- fread(c.d.asBytes,48,1,pf);
+ if (fread(c.d.asBytes,48,1,pf) == 0) {
+ PrintAndLog("Error: File reading error");
+ fclose(pf);
+ return 1;
+ }
fclose(pf);
} else {
tag_mem_supplied = false;
} break;
default: {
PrintAndLog("Error: unkown reader function %d",htf);
- PrintAndLog("Hitag reader functions",htf);
- PrintAndLog(" HitagS (0*)",htf);
- PrintAndLog(" Hitag1 (1*)",htf);
- PrintAndLog(" Hitag2 (2*)",htf);
- PrintAndLog(" 21 <password> (password mode)",htf);
- PrintAndLog(" 22 <nr> <ar> (authentication)",htf);
- PrintAndLog(" 23 <key> (authentication)",htf);
- PrintAndLog(" 25 (test recorded authentications)",htf);
+ PrintAndLog("Hitag reader functions");
+ PrintAndLog(" HitagS (0*)");
+ PrintAndLog(" Hitag1 (1*)");
+ PrintAndLog(" Hitag2 (2*)");
+ PrintAndLog(" 21 <password> (password mode)");
+ PrintAndLog(" 22 <nr> <ar> (authentication)");
+ PrintAndLog(" 23 <key> (authentication) key is in format: ISK high + ISK low");
+ PrintAndLog(" 25 (test recorded authentications)");
return 1;
} break;
}
// Copy the hitag2 function into the first argument
c.arg[0] = htf;
+ // Send the command to the proxmark
SendCommand(&c);
+
+ UsbCommand resp;
+ WaitForResponse(CMD_ACK,&resp);
+
+ // Check the return status, stored in the first argument
+ if (resp.arg[0] == false) return 1;
+
+ uint32_t id = bytes_to_num(resp.d.asBytes,4);
+ char filename[256];
+ FILE* pf = NULL;
+
+ sprintf(filename,"%08x_%04x.ht2",id,(rand() & 0xffff));
+ if ((pf = fopen(filename,"wb")) == NULL) {
+ PrintAndLog("Error: Could not open file [%s]",filename);
+ return 1;
+ }
+
+ // Write the 48 tag memory bytes to file and finalize
+ fwrite(resp.d.asBytes,1,48,pf);
+ fclose(pf);
+
+ PrintAndLog("Succesfully saved tag memory to [%s]",filename);
+
return 0;
}
-static command_t CommandTableHitag[] =
+static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
- {"list", CmdLFHitagList, 1, "List Hitag trace history"},
+ {"list", CmdLFHitagList, 1, "<outfile> List Hitag trace history"},
{"reader", CmdLFHitagReader, 1, "Act like a Hitag Reader"},
- {"sim", CmdLFHitagSim, 1, "Simulate Hitag transponder"},
+ {"sim", CmdLFHitagSim, 1, "<infile> Simulate Hitag transponder"},
{"snoop", CmdLFHitagSnoop, 1, "Eavesdrop Hitag communication"},
- {NULL, NULL, 0, NULL}
+ {NULL, NULL, 0, NULL}
};
int CmdLFHitag(const char *Cmd)
{
- CmdsParse(CommandTableHitag, Cmd);
+ CmdsParse(CommandTable, Cmd);
return 0;
}
int CmdHelp(const char *Cmd)
{
- CmdsHelp(CommandTableHitag);
+ CmdsHelp(CommandTable);
return 0;
}
projects / proxmark3-svn / blobdiff