X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1f065e1dad00ff5a63ebfedb8fbe04a9720bf2a6..818e15b0c815d25fdfb914cd826baf14b48fa19d:/client/cmdlfhitag.c diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c index 718cb703..84fb5458 100644 --- a/client/cmdlfhitag.c +++ b/client/cmdlfhitag.c @@ -8,11 +8,12 @@ // Low frequency Hitag support //----------------------------------------------------------------------------- +#include "cmdlfhitag.h" + #include #include #include -#include "data.h" -#include "proxmark3.h" +#include "comms.h" #include "ui.h" #include "cmdparser.h" #include "common.h" @@ -31,11 +32,9 @@ size_t nbytes(size_t nbits) { int CmdLFHitagList(const char *Cmd) { uint8_t *got = malloc(USB_CMD_DATA_SIZE); - // Query for the actual size of the trace UsbCommand response; - GetFromBigBuf(got, USB_CMD_DATA_SIZE, 0); - WaitForResponse(CMD_ACK, &response); + GetFromBigBuf(got, USB_CMD_DATA_SIZE, 0, &response, -1, false); uint16_t traceLen = response.arg[2]; if (traceLen > USB_CMD_DATA_SIZE) { uint8_t *p = realloc(got, traceLen); @@ -45,14 +44,14 @@ int CmdLFHitagList(const char *Cmd) return 2; } got = p; - GetFromBigBuf(got, traceLen, 0); - WaitForResponse(CMD_ACK,NULL); + GetFromBigBuf(got, traceLen, 0, NULL, -1, false); } PrintAndLog("recorded activity (TraceLen = %d bytes):"); PrintAndLog(" ETU :nbits: who bytes"); PrintAndLog("---------+-----+----+-----------"); + int j; int i = 0; int prev = -1; int len = strlen(Cmd); @@ -67,6 +66,7 @@ int CmdLFHitagList(const char *Cmd) if (strlen(filename) > 0) { if ((pf = fopen(filename,"wb")) == NULL) { PrintAndLog("Error: Could not open file [%s]",filename); + free(got); return 1; } } @@ -93,7 +93,7 @@ int CmdLFHitagList(const char *Cmd) // or each half bit period in 256 levels. int bits = got[i+8]; - int len = nbytes(got[i+8]); + int len = nbytes(bits); if (len > 100) { break; @@ -101,19 +101,43 @@ int CmdLFHitagList(const char *Cmd) if (i + len > traceLen) { break;} uint8_t *frame = (got+i+9); +/* + int fillupBits = 8 - (bits % 8); + byte_t framefilled[bits+fillupBits]; + byte_t* ff = framefilled; + + int response_bit[200] = {0}; + int z = 0; + for (int y = 0; y < len; y++) { + for (j = 0; j < 8; j++) { + response_bit[z] = 0; + if ((frame[y] & ((mask << 7) >> j)) != 0) + response_bit[z] = 1; + z++; + } + } + z = 0; + for (int y = 0; y < len; y++) { + ff[y] = (response_bit[z] << 7) | (response_bit[z + 1] << 6) + | (response_bit[z + 2] << 5) | (response_bit[z + 3] << 4) + | (response_bit[z + 4] << 3) | (response_bit[z + 5] << 2) + | (response_bit[z + 6] << 1) | response_bit[z + 7]; + z += 8; + } +*/ + + + // Break and stick with current result if buffer was not completely full if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; } char line[1000] = ""; - int j; for (j = 0; j < len; j++) { - //if((parityBits >> (len - j - 1)) & 0x01) { if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) { sprintf(line+(j*4), "%02x! ", frame[j]); - } - else { + } else { sprintf(line+(j*4), "%02x ", frame[j]); } } @@ -167,11 +191,11 @@ int CmdLFHitagSim(const char *Cmd) { return 1; } tag_mem_supplied = true; - if (fread(c.d.asBytes,48,1,pf) == 0) { - PrintAndLog("Error: File reading error"); - fclose(pf); + if (fread(c.d.asBytes,1,48,pf) != 48) { + PrintAndLog("Error: File reading error"); + fclose(pf); return 1; - } + } fclose(pf); } else { tag_mem_supplied = false; @@ -194,10 +218,27 @@ int CmdLFHitagReader(const char *Cmd) { c = (UsbCommand){ CMD_READ_HITAG_S }; num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->auth.NrAr); num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4); + c.arg[1] = param_get64ex(Cmd,3,0,0); //firstpage + c.arg[2] = param_get64ex(Cmd,4,0,0); //tag mode } break; case 02: { //RHTSF_KEY c = (UsbCommand){ CMD_READ_HITAG_S }; num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key); + c.arg[1] = param_get64ex(Cmd,2,0,0); //firstpage + c.arg[2] = param_get64ex(Cmd,3,0,0); //tag mode + } break; + case 03: { //RHTSF_CHALLENGE BLOCK + c = (UsbCommand){ CMD_READ_HITAG_S_BLK }; + num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->auth.NrAr); + num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4); + c.arg[1] = param_get64ex(Cmd,3,0,0); //firstpage + c.arg[2] = param_get64ex(Cmd,4,0,0); //tag mode + } break; + case 04: { //RHTSF_KEY BLOCK + c = (UsbCommand){ CMD_READ_HITAG_S_BLK }; + num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key); + c.arg[1] = param_get64ex(Cmd,2,0,0); //firstpage + c.arg[2] = param_get64ex(Cmd,3,0,0); //tag mode } break; case RHT2F_PASSWORD: { num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->pwd.password); @@ -222,8 +263,11 @@ int CmdLFHitagReader(const char *Cmd) { PrintAndLog("Usage: hitag reader "); PrintAndLog("Reader Functions:"); PrintAndLog(" HitagS (0*)"); - PrintAndLog(" 01 (Challenge) read all pages from a Hitag S tag"); - PrintAndLog(" 02 (set to 0 if no authentication is needed) read all pages from a Hitag S tag"); + PrintAndLog(" 01 (Challenge) read all pages from a Hitag S tag"); + PrintAndLog(" 02 (set to 0 if no authentication is needed) read all pages from a Hitag S tag"); + PrintAndLog(" 03 (Challenge) read all blocks from a Hitag S tag"); + PrintAndLog(" 04 (set to 0 if no authentication is needed) read all blocks from a Hitag S tag"); + PrintAndLog(" Valid tagmodes are 0=STANDARD, 1=ADVANCED, 2=FAST_ADVANCED (default is ADVANCED)"); PrintAndLog(" Hitag1 (1*)"); PrintAndLog(" Hitag2 (2*)"); PrintAndLog(" 21 (password mode)"); @@ -239,6 +283,7 @@ int CmdLFHitagReader(const char *Cmd) { c.arg[0] = htf; // Send the command to the proxmark + clearCommandBuffer(); SendCommand(&c); UsbCommand resp; @@ -289,7 +334,7 @@ int CmdLFHitagSimS(const char *Cmd) { return 1; } tag_mem_supplied = true; - if (fread(c.d.asBytes, 4*64, 1, pf) == 0) { + if (fread(c.d.asBytes, 1, 4*64, pf) != 4*64) { PrintAndLog("Error: File reading error"); fclose(pf); return 1; @@ -321,9 +366,9 @@ int CmdLFHitagCheckChallenges(const char *Cmd) { return 1; } file_given = true; - if (fread(c.d.asBytes,8*60,1,pf) == 0) { - PrintAndLog("Error: File reading error"); - fclose(pf); + if (fread(c.d.asBytes,1,8*60,pf) != 8*60) { + PrintAndLog("Error: File reading error"); + fclose(pf); return 1; } fclose(pf); @@ -333,6 +378,7 @@ int CmdLFHitagCheckChallenges(const char *Cmd) { //file with all the challenges to try c.arg[0] = (uint32_t)file_given; + c.arg[1] = param_get64ex(Cmd,2,0,0); //get mode SendCommand(&c); return 0; @@ -349,7 +395,9 @@ int CmdLFHitagWP(const char *Cmd) { c.arg[2]= param_get32ex(Cmd, 2, 0, 10); num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->auth.data); } break; - case 04: { //WHTSF_KEY + case 04: + case 24: + { //WHTSF_KEY num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key); c.arg[2]= param_get32ex(Cmd, 2, 0, 10); num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->crypto.data); @@ -363,6 +411,7 @@ int CmdLFHitagWP(const char *Cmd) { PrintAndLog(" 04 (set to 0 if no authentication is needed) write page on a Hitag S tag"); PrintAndLog(" Hitag1 (1*)"); PrintAndLog(" Hitag2 (2*)"); + PrintAndLog(" 24 (set to 0 if no authentication is needed) write page on a Hitag S tag"); return 1; } break; } @@ -390,7 +439,7 @@ static command_t CommandTable[] = {"snoop", CmdLFHitagSnoop, 1, "Eavesdrop Hitag communication"}, {"writer", CmdLFHitagWP, 1, "Act like a Hitag Writer" }, {"simS", CmdLFHitagSimS, 1, " Simulate HitagS transponder" }, - {"checkChallenges", CmdLFHitagCheckChallenges, 1, " test all challenges" }, { + {"checkChallenges", CmdLFHitagCheckChallenges, 1, " test all challenges" }, { NULL,NULL, 0, NULL } };