added automatically saving the hitag2 memory content to file

This commit is contained in:
roel@libnfc.org 2012-12-09 21:25:29 +00:00
commit ab4da50d99
3 changed files with 68 additions and 48 deletions

View file

@ -30,18 +30,6 @@ int CmdLFHitagList(const char *Cmd)
GetFromBigBuf(got,sizeof(got),0);
WaitForResponse(CMD_ACK,NULL);
char filename[256];
FILE* pf = NULL;
if (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;
}
}
}
PrintAndLog("recorded activity:");
PrintAndLog(" ETU :rssi: who bytes");
PrintAndLog("---------+----+----+-----------");
@ -49,6 +37,9 @@ int CmdLFHitagList(const char *Cmd)
int i = 0;
int prev = -1;
char filename[256];
FILE* pf = NULL;
for (;;) {
if(i >= 1900) {
break;
@ -198,14 +189,14 @@ int CmdLFHitagReader(const char *Cmd) {
} 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) key is in format: ISK high + ISK low",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;
}
@ -213,7 +204,31 @@ int CmdLFHitagReader(const char *Cmd) {
// 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;
}

View file

@ -196,7 +196,8 @@ static void *main_loop(void *targ) {
}
int main(int argc, char* argv[]) {
srand(time(0));
if (argc < 2) {
printf("syntax: %s <port>\n\n",argv[0]);
return 1;