github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ADD: fixed some spelling misstakes in luascript.

Browse source 
ADD: fixed some spelling misstakes in "hf mfu eload" help
This commit is contained in:
iceman1001 2015-10-05 21:25:00 +02:00
commit f3cfe428f8
5 changed files with 50 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhfmfu.c
View file

@ -1199,7 +1199,7 @@ int usage_hf_mfu_wrbl(void) {
int usage_hf_mfu_eload(void) { int usage_hf_mfu_eload(void) {
PrintAndLog("It loads emulator dump from the file `filename.eml`\n"); PrintAndLog("It loads emulator dump from the file `filename.eml`\n");
PrintAndLog("Usage: hf mf eload t <card memory> i <file name w/o `.eml`>\n"); PrintAndLog("Usage: hf mfu eload t <card memory> i <file name w/o `.eml`>\n");
PrintAndLog(" Options:"); PrintAndLog(" Options:");
PrintAndLog(" t <card memory> : Tag memorysize/type"); PrintAndLog(" t <card memory> : Tag memorysize/type");
PrintAndLog(" i <file> : file name w/o `.eml`"); PrintAndLog(" i <file> : file name w/o `.eml`");

5
client/cmdlfawid.c
View file

@ -175,7 +175,7 @@ int CmdAWIDSim(const char *Cmd)
int CmdAWIDClone(const char *Cmd) int CmdAWIDClone(const char *Cmd)
{ {
clearCommandBuffer(); clearCommandBuffer();
uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0; uint32_t fc=0,cn=0,blocks[4] = {0x00107060, 0, 0, 0x11111111}, i=0;
uint8_t BitStream[12]; uint8_t BitStream[12];
uint8_t *BS=BitStream; uint8_t *BS=BitStream;
@ -189,10 +189,12 @@ clearCommandBuffer();
fc &= 0xFF; fc &= 0xFF;
PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc); PrintAndLog("Facility-Code Truncated to 8-bits (AWID26): %u", fc);
} }
if ((cn & 0xFFFF) != cn) { if ((cn & 0xFFFF) != cn) {
cn &= 0xFFFF; cn &= 0xFFFF;
PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn); PrintAndLog("Card Number Truncated to 16-bits (AWID26): %u", cn);
} }
if (getAWIDBits(fc,cn,BS)) { 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)", 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]); 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]);
@ -212,7 +214,6 @@ clearCommandBuffer();
PrintAndLog("Error occurred, device did not respond during write operation."); PrintAndLog("Error occurred, device did not respond during write operation.");
return -1; return -1;
} }
} }
} }
return 0; return 0;

1
client/hid-flasher/usb_cmd.h
View file

@ -87,6 +87,7 @@ typedef struct{
#define CMD_T55XX_WRITE_BLOCK 0x0215 #define CMD_T55XX_WRITE_BLOCK 0x0215
#define CMD_T55XX_READ_TRACE 0x0216 #define CMD_T55XX_READ_TRACE 0x0216
#define CMD_PCF7931_READ 0x0217 #define CMD_PCF7931_READ 0x0217
#define CMD_PCF7931_WRITE 0x0223
#define CMD_EM4X_READ_WORD 0x0218 #define CMD_EM4X_READ_WORD 0x0218
#define CMD_EM4X_WRITE_WORD 0x0219 #define CMD_EM4X_WRITE_WORD 0x0219
#define CMD_IO_DEMOD_FSK 0x021A #define CMD_IO_DEMOD_FSK 0x021A

1
client/lualibs/commands.lua
View file

@ -46,6 +46,7 @@ local _commands = {
CMD_T55XX_WRITE_BLOCK = 0x0215, CMD_T55XX_WRITE_BLOCK = 0x0215,
CMD_T55XX_READ_TRACE = 0x0216, CMD_T55XX_READ_TRACE = 0x0216,
CMD_PCF7931_READ = 0x0217, CMD_PCF7931_READ = 0x0217,
CMD_PCF7931_WRITE = 0x0223,
CMD_EM4X_READ_WORD = 0x0218, CMD_EM4X_READ_WORD = 0x0218,
CMD_EM4X_WRITE_WORD = 0x0219, CMD_EM4X_WRITE_WORD = 0x0219,
CMD_IO_DEMOD_FSK = 0x021A, CMD_IO_DEMOD_FSK = 0x021A,

12
client/scripts/dumptoemul-mfu.lua
View file

@ -2,9 +2,8 @@
-- Have a look there for further details -- Have a look there for further details
getopt = require('getopt') getopt = require('getopt')
bin = require('bin') bin = require('bin')
example = "script run dumptoemul-mfu -i dumpdata-foobar.bin"
example = "script run dumptoemul -i dumpdata-foobar.bin" author = "Martin Holst Swende \n @Marshmellow"
author = "Martin Holst Swende"
usage = "script run dumptoemul [-i <file>] [-o <file>]" usage = "script run dumptoemul [-i <file>] [-o <file>]"
desc =[[ desc =[[
This script takes a dumpfile from 'hf mf dump' and converts it to a format that can be used 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 <filename> Specifies the output file. If omitted, <uid>.eml is used. -o <filename> Specifies the output file. If omitted, <uid>.eml is used.
]] ]]
-------------------------------
-- Some utilities
-------------------------------
--- ---
-- A debug printout-function -- A debug printout-function
function dbg(args) function dbg(args)
@ -34,11 +28,11 @@ function oops(err)
print("ERROR: ",err) print("ERROR: ",err)
end end
--- ---
-- Usage help -- Usage help
function help() function help()
print(desc) print(desc)
print(author)
print("Example usage") print("Example usage")
print(example) print(example)
end end