X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f71f4deb8f8f1e932c81f3e62e6ab67012e07b33..2589bb2c2187559dfd9e2acbccc16962198bf569:/client/cmdlfhitag.c diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c index fe5ba587..718cb703 100644 --- a/client/cmdlfhitag.c +++ b/client/cmdlfhitag.c @@ -17,8 +17,9 @@ #include "cmdparser.h" #include "common.h" #include "util.h" +#include "parity.h" #include "hitag2.h" -#include "sleep.h" +#include "hitagS.h" #include "cmdmain.h" static int CmdHelp(const char *Cmd); @@ -107,15 +108,9 @@ int CmdLFHitagList(const char *Cmd) char line[1000] = ""; int j; for (j = 0; j < len; j++) { - int oddparity = 0x01; - int k; - - for (k=0;k<8;k++) { - oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01); - } //if((parityBits >> (len - j - 1)) & 0x01) { - if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) { + if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) { sprintf(line+(j*4), "%02x! ", frame[j]); } else { @@ -190,14 +185,20 @@ int CmdLFHitagSim(const char *Cmd) { } int CmdLFHitagReader(const char *Cmd) { -// UsbCommand c = {CMD_READER_HITAG}; - -// param_get32ex(Cmd,1,0,16); UsbCommand c = {CMD_READER_HITAG};//, {param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),param_get32ex(Cmd,3,0,16)}}; hitag_data* htd = (hitag_data*)c.d.asBytes; hitag_function htf = param_get32ex(Cmd,0,0,10); switch (htf) { + case 01: { //RHTSF_CHALLENGE + 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); + } break; + case 02: { //RHTSF_KEY + c = (UsbCommand){ CMD_READ_HITAG_S }; + num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key); + } break; case RHT2F_PASSWORD: { num_to_bytes(param_get32ex(Cmd,1,0,16),4,htd->pwd.password); } break; @@ -207,21 +208,29 @@ int CmdLFHitagReader(const char *Cmd) { } break; case RHT2F_CRYPTO: { num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key); -// num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4); + // num_to_bytes(param_get32ex(Cmd,2,0,16),4,htd->auth.NrAr+4); } break; case RHT2F_TEST_AUTH_ATTEMPTS: { // No additional parameters needed } break; + case RHT2F_UID_ONLY: { + // No additional parameters needed + } break; default: { - PrintAndLog("Error: unkown reader function %d",htf); - PrintAndLog("Hitag reader functions"); + PrintAndLog("\nError: unkown reader function %d",htf); + PrintAndLog(""); + 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(" Hitag1 (1*)"); PrintAndLog(" Hitag2 (2*)"); PrintAndLog(" 21 (password mode)"); PrintAndLog(" 22 (authentication)"); PrintAndLog(" 23 (authentication) key is in format: ISK high + ISK low"); PrintAndLog(" 25 (test recorded authentications)"); + PrintAndLog(" 26 just read UID"); return 1; } break; } @@ -229,6 +238,137 @@ 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); + + if (htf == RHT2F_UID_ONLY){ + PrintAndLog("Valid Hitag2 tag found - UID: %08x",id); + } else { + 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; +} + + +int CmdLFHitagSimS(const char *Cmd) { + UsbCommand c = { CMD_SIMULATE_HITAG_S }; + char filename[FILE_PATH_SIZE] = { 0x00 }; + FILE* pf; + bool tag_mem_supplied; + 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; + if (fread(c.d.asBytes, 4*64, 1, pf) == 0) { + PrintAndLog("Error: File reading error"); + fclose(pf); + return 1; + } + fclose(pf); + } else { + tag_mem_supplied = false; + } + + // Does the tag comes with memory + c.arg[0] = (uint32_t) tag_mem_supplied; + + SendCommand(&c); + return 0; +} + +int CmdLFHitagCheckChallenges(const char *Cmd) { + UsbCommand c = { CMD_TEST_HITAGS_TRACES }; + char filename[FILE_PATH_SIZE] = { 0x00 }; + FILE* pf; + bool file_given; + 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; + } + file_given = true; + if (fread(c.d.asBytes,8*60,1,pf) == 0) { + PrintAndLog("Error: File reading error"); + fclose(pf); + return 1; + } + fclose(pf); + } else { + file_given = false; + } + + //file with all the challenges to try + c.arg[0] = (uint32_t)file_given; + + SendCommand(&c); + return 0; +} + + +int CmdLFHitagWP(const char *Cmd) { + UsbCommand c = { CMD_WR_HITAG_S }; + hitag_data* htd = (hitag_data*)c.d.asBytes; + hitag_function htf = param_get32ex(Cmd,0,0,10); + switch (htf) { + case 03: { //WHTSF_CHALLENGE + num_to_bytes(param_get64ex(Cmd,1,0,16),8,htd->auth.NrAr); + 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 + 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); + + } break; + default: { + PrintAndLog("Error: unkown writer function %d",htf); + PrintAndLog("Hitag writer functions"); + PrintAndLog(" HitagS (0*)"); + PrintAndLog(" 03 (Challenge) write page on a Hitag S tag"); + PrintAndLog(" 04 (set to 0 if no authentication is needed) write page on a Hitag S tag"); + PrintAndLog(" Hitag1 (1*)"); + PrintAndLog(" Hitag2 (2*)"); + return 1; + } break; + } + // Copy the hitag function into the first argument + c.arg[0] = htf; + // Send the command to the proxmark SendCommand(&c); @@ -237,34 +377,21 @@ int CmdLFHitagReader(const char *Cmd) { // 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 CommandTable[] = { - {"help", CmdHelp, 1, "This help"}, - {"list", CmdLFHitagList, 1, " List Hitag trace history"}, - {"reader", CmdLFHitagReader, 1, "Act like a Hitag Reader"}, - {"sim", CmdLFHitagSim, 1, " Simulate Hitag transponder"}, - {"snoop", CmdLFHitagSnoop, 1, "Eavesdrop Hitag communication"}, - {NULL, NULL, 0, NULL} + {"help", CmdHelp, 1, "This help"}, + {"list", CmdLFHitagList, 1, " List Hitag trace history"}, + {"reader", CmdLFHitagReader, 1, "Act like a Hitag Reader"}, + {"sim", CmdLFHitagSim, 1, " Simulate Hitag transponder"}, + {"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" }, { + NULL,NULL, 0, NULL } }; int CmdLFHitag(const char *Cmd)