From f3cfe428f819157da31e4fd41e8a23c838d8a574 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 5 Oct 2015 21:25:00 +0200 Subject: [PATCH] ADD: fixed some spelling misstakes in luascript. ADD: fixed some spelling misstakes in "hf mfu eload" help --- client/cmdhfmfu.c | 2 +- client/cmdlfawid.c | 89 ++++++++++++++++--------------- client/hid-flasher/usb_cmd.h | 1 + client/lualibs/commands.lua | 1 + client/scripts/dumptoemul-mfu.lua | 12 ++--- 5 files changed, 51 insertions(+), 54 deletions(-) diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index f6905b24..aec95e79 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -1199,7 +1199,7 @@ int usage_hf_mfu_wrbl(void) { int usage_hf_mfu_eload(void) { PrintAndLog("It loads emulator dump from the file `filename.eml`\n"); - PrintAndLog("Usage: hf mf eload t i \n"); + PrintAndLog("Usage: hf mfu eload t i \n"); PrintAndLog(" Options:"); PrintAndLog(" t : Tag memorysize/type"); PrintAndLog(" i : file name w/o `.eml`"); diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index 5fdbf654..ed56f660 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -175,66 +175,67 @@ int CmdAWIDSim(const char *Cmd) int CmdAWIDClone(const char *Cmd) { -clearCommandBuffer(); - uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0; - uint8_t BitStream[12]; - uint8_t *BS=BitStream; + clearCommandBuffer(); + uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0; + uint8_t BitStream[12]; + uint8_t *BS=BitStream; UsbCommand c, resp; - if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) { - return usage_lf_awid_clone(); - } - - if ((fc & 0xFF) != fc) { - fc &= 0xFF; - PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc); - } - if ((cn & 0xFFFF) != cn) { - cn &= 0xFFFF; - PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn); - } - if (getAWIDBits(fc,cn,BS)) { - PrintAndLog("Preparing to clone AWID26 to T55x7 with FC: %u, CN: %u (Raw: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x)", - fc,cn, BS[0],BS[1],BS[2],BS[3],BS[4],BS[5],BS[6],BS[7],BS[8],BS[9],BS[10],BS[11]); - blocks[1] = (BS[0]<<24) + (BS[1]<<16) + (BS[2]<<8) + (BS[3]); - blocks[2] = (BS[4]<<24) + (BS[5]<<16) + (BS[6]<<8) + (BS[7]); - PrintAndLog("Block 0: 0x%08x", blocks[0]); - PrintAndLog("Block 1: 0x%08x", blocks[1]); - PrintAndLog("Block 2: 0x%08x", blocks[2]); - PrintAndLog("Block 3: 0x%08x", blocks[3]); - for (i=0; i<4; i++) { - c.cmd = CMD_T55XX_WRITE_BLOCK; - c.arg[0] = blocks[i]; - c.arg[1] = i; - c.arg[2] = 0; - SendCommand(&c); + if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) { + return usage_lf_awid_clone(); + } + + if ((fc & 0xFF) != fc) { + fc &= 0xFF; + PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc); + } + + if ((cn & 0xFFFF) != cn) { + cn &= 0xFFFF; + PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn); + } + + if (getAWIDBits(fc,cn,BS)) { + PrintAndLog("Preparing to clone AWID26 to T55x7 with FC: %u, CN: %u (Raw: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x)", + fc,cn, BS[0],BS[1],BS[2],BS[3],BS[4],BS[5],BS[6],BS[7],BS[8],BS[9],BS[10],BS[11]); + blocks[1] = (BS[0]<<24) + (BS[1]<<16) + (BS[2]<<8) + (BS[3]); + blocks[2] = (BS[4]<<24) + (BS[5]<<16) + (BS[6]<<8) + (BS[7]); + PrintAndLog("Block 0: 0x%08x", blocks[0]); + PrintAndLog("Block 1: 0x%08x", blocks[1]); + PrintAndLog("Block 2: 0x%08x", blocks[2]); + PrintAndLog("Block 3: 0x%08x", blocks[3]); + for (i=0; i<4; i++) { + c.cmd = CMD_T55XX_WRITE_BLOCK; + c.arg[0] = blocks[i]; + c.arg[1] = i; + c.arg[2] = 0; + SendCommand(&c); if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){ PrintAndLog("Error occurred, device did not respond during write operation."); return -1; } - - } - } - return 0; + } + } + return 0; } static command_t CommandTable[] = { - {"help", CmdHelp, 1, "This help"}, - {"fskdemod", CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"}, - {"sim", CmdAWIDSim, 0, " -- AWID tag simulator"}, - {"clone", CmdAWIDClone, 0, " -- Clone AWID to T55x7 (tag must be in range of antenna)"}, - {NULL, NULL, 0, NULL} + {"help", CmdHelp, 1, "This help"}, + {"fskdemod", CmdAWIDDemodFSK, 0, "['1'] Realtime AWID FSK demodulator (option '1' for one tag only)"}, + {"sim", CmdAWIDSim, 0, " -- AWID tag simulator"}, + {"clone", CmdAWIDClone, 0, " -- Clone AWID to T55x7 (tag must be in range of antenna)"}, + {NULL, NULL, 0, NULL} }; int CmdLFAWID(const char *Cmd) { - CmdsParse(CommandTable, Cmd); - return 0; + CmdsParse(CommandTable, Cmd); + return 0; } int CmdHelp(const char *Cmd) { - CmdsHelp(CommandTable); - return 0; + CmdsHelp(CommandTable); + return 0; } diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h index 93715563..8f4eee97 100644 --- a/client/hid-flasher/usb_cmd.h +++ b/client/hid-flasher/usb_cmd.h @@ -87,6 +87,7 @@ typedef struct{ #define CMD_T55XX_WRITE_BLOCK 0x0215 #define CMD_T55XX_READ_TRACE 0x0216 #define CMD_PCF7931_READ 0x0217 +#define CMD_PCF7931_WRITE 0x0223 #define CMD_EM4X_READ_WORD 0x0218 #define CMD_EM4X_WRITE_WORD 0x0219 #define CMD_IO_DEMOD_FSK 0x021A diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua index 96805e43..ae0568f8 100644 --- a/client/lualibs/commands.lua +++ b/client/lualibs/commands.lua @@ -46,6 +46,7 @@ local _commands = { CMD_T55XX_WRITE_BLOCK = 0x0215, CMD_T55XX_READ_TRACE = 0x0216, CMD_PCF7931_READ = 0x0217, + CMD_PCF7931_WRITE = 0x0223, CMD_EM4X_READ_WORD = 0x0218, CMD_EM4X_WRITE_WORD = 0x0219, CMD_IO_DEMOD_FSK = 0x021A, diff --git a/client/scripts/dumptoemul-mfu.lua b/client/scripts/dumptoemul-mfu.lua index bdcc667b..b901a2ba 100644 --- a/client/scripts/dumptoemul-mfu.lua +++ b/client/scripts/dumptoemul-mfu.lua @@ -2,9 +2,8 @@ -- Have a look there for further details getopt = require('getopt') bin = require('bin') - -example = "script run dumptoemul -i dumpdata-foobar.bin" -author = "Martin Holst Swende" +example = "script run dumptoemul-mfu -i dumpdata-foobar.bin" +author = "Martin Holst Swende \n @Marshmellow" usage = "script run dumptoemul [-i ] [-o ]" desc =[[ This script takes a dumpfile from 'hf mf dump' and converts it to a format that can be used @@ -16,11 +15,6 @@ Arguments: -o Specifies the output file. If omitted, .eml is used. ]] - -------------------------------- --- Some utilities -------------------------------- - --- -- A debug printout-function function dbg(args) @@ -34,11 +28,11 @@ function oops(err) print("ERROR: ",err) end - --- -- Usage help function help() print(desc) + print(author) print("Example usage") print(example) end -- 2.39.5