diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index 6276abb8b..a6ecd8e2f 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -167,8 +167,8 @@ static int CmdHIDWatch(const char *Cmd) { "Enables HID compatible reader mode printing details.\n" "By default, values are printed and logged until the button is pressed or another USB command is issued.\n", "lf hid watch" - ); - + ); + void *argtable[] = { arg_param_begin, arg_param_end @@ -198,8 +198,8 @@ static int CmdHIDSim(const char *Cmd) { CLIParserInit(&ctx, "lf hid sim", "Enables simulation of HID card with card number.", "lf hid sim 2006ec0c86" - ); - + ); + void *argtable[] = { arg_param_begin, arg_lit0("l", "long", "Simulate HID tag with long ID"), @@ -215,7 +215,7 @@ static int CmdHIDSim(const char *Cmd) { CLIParserFree(ctx); if (long_id) { - for (i=0; i < idlen; ++i) { + for (i = 0; i < idlen; ++i) { hi2 = (hi2 << 4) | (hi >> 28); hi = (hi << 4) | (lo >> 28); lo = (lo << 4) | (id[i] >> 4); //get first 4 bits @@ -227,7 +227,7 @@ static int CmdHIDSim(const char *Cmd) { PrintAndLogEx(INFO, "Simulating HID tag with long ID: " _GREEN_("%x%08x%08x"), hi2, hi, lo); payload.longFMT = 1; } else { - for (i=0; i < idlen; ++i) { + for (i = 0; i < idlen; ++i) { hi = (hi << 4) | (lo >> 28); lo = (lo << 4) | (id[i] >> 4); //get first 4 bits @@ -266,8 +266,8 @@ static int CmdHIDClone(const char *Cmd) { "Clone HID to T55x7. Tag must be on antenna!", "lf hid clone 2006ec0c86\n" "lf hid clone -l 2006ec0c86" - ); - + ); + void *argtable[] = { arg_param_begin, arg_lit0("l", "long", "84bit HID long ID"), @@ -285,7 +285,7 @@ static int CmdHIDClone(const char *Cmd) { uint8_t longid[1] = {0}; if (long_id) { - for (i=0; i < idlen; ++i) { + for (i = 0; i < idlen; ++i) { hi2 = (hi2 << 4) | (hi >> 28); hi = (hi << 4) | (lo >> 28); lo = (lo << 4) | (id[i] >> 4); //get first 4 bits @@ -298,7 +298,7 @@ static int CmdHIDClone(const char *Cmd) { longid[0] = 1; } else { - for (i=0; i < idlen; ++i) { + for (i = 0; i < idlen; ++i) { hi = (hi << 4) | (lo >> 28); lo = (lo << 4) | (id[i] >> 4); //get first 4 bits @@ -350,8 +350,8 @@ static int CmdHIDBrute(const char *Cmd) { "lf hid brute -w H10301 -f 224\n" "lf hid brute -w H10301 -f 21 -d 2000\n" "lf hid brute -v -w H10301 -f 21 -c 200 -d 2000\n" - ); - + ); + void *argtable[] = { arg_param_begin, arg_lit0("v", "verbose", "verbose logging, show all tries"), @@ -360,18 +360,18 @@ static int CmdHIDBrute(const char *Cmd) { arg_int0("c", "cn", "dec", "card number to start with"), arg_int0("i", NULL, "dec", "issue level"), arg_int0("o", "oem", "dec", "OEM code"), - arg_int0("d", "delay", "dec", "delay betweens attempts in ms. Default 1000ms"), + arg_int0("d", "delay", "dec", "delay betweens attempts in ms. Default 1000ms"), arg_lit0(NULL, "up", "direction to increment card number. (default is both directions)"), - arg_lit0(NULL, "down", "direction to decrement card number. (default is both directions)"), + arg_lit0(NULL, "down", "direction to decrement card number. (default is both directions)"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, false); bool verbose = arg_get_lit(ctx, 1); - + CLIGetStrWithReturn(ctx, 2, format, &formatLen); - format_idx = HIDFindCardFormat((char*) format); + format_idx = HIDFindCardFormat((char *) format); if (format_idx == -1) { PrintAndLogEx(WARNING, "Unknown format: " _YELLOW_("%s"), format); CLIParserFree(ctx); diff --git a/client/src/cmdlfkeri.c b/client/src/cmdlfkeri.c index ee11144d8..1279c6f8c 100644 --- a/client/src/cmdlfkeri.c +++ b/client/src/cmdlfkeri.c @@ -186,7 +186,7 @@ static int CmdKeriRead(const char *Cmd) { static int CmdKeriClone(const char *Cmd) { bool q5 = false; - + uint8_t keritype[2] = {'i'}; // default to internalid int typeLen = 0; uint32_t fc = 0; @@ -213,14 +213,14 @@ static int CmdKeriClone(const char *Cmd) { void *argtable[] = { arg_param_begin, - arg_lit0("q", "q5", "specify writing to Q5/T5555 tag"), + arg_lit0("q", "q5", "specify writing to Q5/T5555 tag"), arg_str0("t", "type", "", "Type m - MS, i - Internal ID"), arg_int0(NULL, "fc", "", "Facility Code"), arg_int1(NULL, "id", "", "Keri ID"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, false); - + if (arg_get_lit(ctx, 1)) { blocks[0] = T5555_FIXED | T5555_MODULATION_PSK1 | T5555_SET_BITRATE(32) | T5555_PSK_RF_2 | 2 << T5555_MAXBLOCK_SHIFT; q5 = true; @@ -268,8 +268,8 @@ static int CmdKeriSim(const char *Cmd) { CLIParserInit(&ctx, "lf keri sim", "Enables simulation of KERI card with card number.", "lf keri sim --id 112233" - ); - + ); + void *argtable[] = { arg_param_begin, arg_int1(NULL, "id", "", "KERI Internal ID"), @@ -280,7 +280,7 @@ static int CmdKeriSim(const char *Cmd) { uint64_t internalid = arg_get_int_def(ctx, 1, 0); CLIParserFree(ctx); - + internalid |= 0x80000000; internalid <<= 3; internalid += 7; diff --git a/client/src/cmdwiegand.c b/client/src/cmdwiegand.c index 25727db33..0e4b31b1c 100644 --- a/client/src/cmdwiegand.c +++ b/client/src/cmdwiegand.c @@ -26,30 +26,30 @@ static int CmdHelp(const char *Cmd); static void print_wiegand_code(wiegand_message_t *packed) { - const char* s = "Encoded wiegand: "; + const char *s = "Encoded wiegand: "; if (packed->Top != 0) { PrintAndLogEx(SUCCESS, "%s" _GREEN_("%X%08X%08X"), - s, - (uint32_t)packed->Top, - (uint32_t)packed->Mid, - (uint32_t)packed->Bot - ); + s, + (uint32_t)packed->Top, + (uint32_t)packed->Mid, + (uint32_t)packed->Bot + ); } else { PrintAndLogEx(SUCCESS, "%s" _YELLOW_("%X%08X"), - s, - (uint32_t)packed->Mid, - (uint32_t)packed->Bot - ); + s, + (uint32_t)packed->Mid, + (uint32_t)packed->Bot + ); } } int CmdWiegandList(const char *Cmd) { - + CLIParserContext *ctx; CLIParserInit(&ctx, "wiegand info", "List available wiegand formats", "wiegand list" - ); + ); void *argtable[] = { arg_param_begin, @@ -68,7 +68,7 @@ int CmdWiegandEncode(const char *Cmd) { CLIParserInit(&ctx, "wiegand encode", "Encode wiegand formatted number to raw hex", "wiegand encode -w H10301 --fc 101 --cn 1337" - ); + ); void *argtable[] = { arg_param_begin, @@ -76,22 +76,22 @@ int CmdWiegandEncode(const char *Cmd) { arg_u64_1(NULL, "cn", "", "card number"), arg_u64_0(NULL, "issue", "", "issue level"), arg_u64_0(NULL, "oem", "", "OEM code"), - arg_str1("w", "wiegand", "", "see `wiegand list` for available formats"), + arg_str1("w", "wiegand", "", "see `wiegand list` for available formats"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); wiegand_card_t data; memset(&data, 0, sizeof(wiegand_card_t)); - + data.FacilityCode = arg_get_u32_def(ctx, 1, 0); data.CardNumber = arg_get_u64_def(ctx, 2, 0); data.IssueLevel = arg_get_u32_def(ctx, 3, 0); data.OEM = arg_get_u32_def(ctx, 4, 0); - + int len = 0; char format[16] = {0}; - CLIParamStrToBuf(arg_get_str(ctx, 5), (uint8_t*)format, sizeof(format), &len); + CLIParamStrToBuf(arg_get_str(ctx, 5), (uint8_t *)format, sizeof(format), &len); CLIParserFree(ctx); int idx = HIDFindCardFormat(format); @@ -118,7 +118,7 @@ int CmdWiegandDecode(const char *Cmd) { CLIParserInit(&ctx, "wiegand decode", "Decode raw hex to wiegand format", "wiegand decode --raw 2006f623ae" - ); + ); void *argtable[] = { arg_param_begin, @@ -128,19 +128,19 @@ int CmdWiegandDecode(const char *Cmd) { }; CLIExecWithReturn(ctx, Cmd, argtable, false); - bool ignore_parity = arg_get_lit(ctx, 1); + bool ignore_parity = arg_get_lit(ctx, 1); int len = 0; char hex[40] = {0}; - CLIParamStrToBuf(arg_get_str(ctx, 2), (uint8_t*)hex, sizeof(hex), &len); + CLIParamStrToBuf(arg_get_str(ctx, 2), (uint8_t *)hex, sizeof(hex), &len); CLIParserFree(ctx); - + if (len == 0) { PrintAndLogEx(ERR, "empty input"); return PM3_EINVARG; } - + uint32_t top = 0, mid = 0, bot = 0; - hexstring_to_u96(&top, &mid, &bot, hex); + hexstring_to_u96(&top, &mid, &bot, hex); wiegand_message_t packed = initialize_message_object(top, mid, bot); HIDTryUnpack(&packed, ignore_parity);